Namonay/42_irc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

je suis aigri

Browse Source
This commit is contained in:
Kbz-8
2024-01-30 17:35:50 +01:00
parent 64fb3e539d
commit b90087188f
5 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/channel.hpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */ /* Created: 2024/01/21 10:34:25 by maldavid #+# #+# */
/* Updated: 2024/01/29 20:04:19 by vvaas ### ########.fr */ /* Updated: 2024/01/30 17:23:28 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -42,7 +42,7 @@ namespace irc
inline std::size_t getNumberOfClients() const { return _clients.size(); } inline std::size_t getNumberOfClients() const { return _clients.size(); }
inline int getChannelSize() const { return _channel_size; } inline int getChannelSize() const { return _channel_size; }
void ModOperator(unstd::SharedPtr<class Client> client, const std::string &clientname, bool mode); void modOperator(unstd::SharedPtr<class Client> client, const std::string &clientname, bool mode);
inline bool removeOperator(unstd::SharedPtr<Client> op) { return _operators.erase(op); } inline bool removeOperator(unstd::SharedPtr<Client> op) { return _operators.erase(op); }
void changeMode(unstd::SharedPtr<class Client> client, const Message& msg); void changeMode(unstd::SharedPtr<class Client> client, const Message& msg);
bool isOp(unstd::SharedPtr<Client> client) const; bool isOp(unstd::SharedPtr<Client> client) const;

3
includes/config.hpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/22 09:45:10 by maldavid #+# #+# */ /* Created: 2024/01/22 09:45:10 by maldavid #+# #+# */
/* Updated: 2024/01/30 01:37:03 by vvaas ### ########.fr */ /* Updated: 2024/01/30 17:34:11 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -18,4 +18,5 @@
#define MAX_USERS 20 #define MAX_USERS 20
#define NULL_SOCKET -1 #define NULL_SOCKET -1
#define LEGAL_CHARACTER "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789{}[]\\|^`-_" #define LEGAL_CHARACTER "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789{}[]\\|^`-_"
#endif #endif

101
srcs/channel.cpp
View File

@@ -6,12 +6,13 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/21 10:36:21 by maldavid #+# #+# */ /* Created: 2024/01/21 10:36:21 by maldavid #+# #+# */
/* Updated: 2024/01/29 23:47:14 by vvaas ### ########.fr */ /* Updated: 2024/01/30 17:33:40 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
#include <channel.hpp> #include <channel.hpp>
#include <logs.hpp> #include <logs.hpp>
#include <cerrno>
#include <errorscode.hpp> #include <errorscode.hpp>
#include <cstdlib> #include <cstdlib>
#include <unstd/string.hpp> #include <unstd/string.hpp>
@@ -37,39 +38,38 @@ namespace irc
sendWho(client); sendWho(client);
} }
void Channel::ModOperator(unstd::SharedPtr<class Client> client, const std::string &clientname, bool mode) void Channel::modOperator(unstd::SharedPtr<class Client> client, const std::string& clientname, bool mode)
{ {
client_it it; client_it it;
logs::report(log_message, "mode operator, mode = %d", mode); logs::report(log_message, "mode operator, mode = %d", mode);
if (mode) if(mode)
{ {
for (it = _clients.begin(); it != _clients.end(); ++it) for(it = _clients.begin(); it != _clients.end(); ++it)
{ {
if (const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() == clientname) if(const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() == clientname)
{ {
_operators.insert(const_cast<unstd::SharedPtr<irc::Client>&>(*it)); _operators.insert(const_cast<unstd::SharedPtr<irc::Client>&>(*it));
break ; break;
} }
} }
if (it == _clients.end()) if(it == _clients.end())
client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel"); client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel");
return;
} }
else
{ for(it = _operators.begin(); it != _operators.end(); ++it)
for (it = _operators.begin(); it != _operators.end(); ++it)
{ {
logs::report(log_message, "nickname %s, clientname : %s", const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName().c_str(), clientname.c_str()); logs::report(log_message, "nickname %s, clientname : %s", const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName().c_str(), clientname.c_str());
if (const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() == clientname) if(const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName() == clientname)
{ {
logs::report(log_message, "found %s to erase", const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName().c_str()); logs::report(log_message, "found %s to erase", const_cast<unstd::SharedPtr<irc::Client>&>(*it)->getNickName().c_str());
_operators.erase(it); _operators.erase(it);
break; break;
} }
} }
if (it == _operators.end()) if(it == _operators.end())
client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel"); client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel");
} }
}
bool Channel::removeClient(unstd::SharedPtr<Client> client) bool Channel::removeClient(unstd::SharedPtr<Client> client)
{ {
@@ -116,7 +116,7 @@ namespace irc
std::string modes; std::string modes;
std::string out = "MODE "; std::string out = "MODE ";
for (std::vector<std::string>::iterator it = mode.begin() + 1; it != mode.end(); ++it) for(std::vector<std::string>::iterator it = mode.begin() + 1; it != mode.end(); ++it)
{ {
modes += *it; modes += *it;
modes += " "; modes += " ";
@@ -125,67 +125,76 @@ namespace irc
for(client_it it = _clients.begin(); it != _clients.end(); ++it) for(client_it it = _clients.begin(); it != _clients.end(); ++it)
const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), out, modes); const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), out, modes);
} }
void Channel::showModes(unstd::SharedPtr<Client> client) void Channel::showModes(unstd::SharedPtr<Client> client)
{ {
std::string modes = " +"; std::string modes = " +";
if (_invite_only) if(_invite_only)
modes += 'i'; modes += 'i';
if (_topic_op_restrict) if(_topic_op_restrict)
modes += 't'; modes += 't';
if (_password.size() > 0) if(_password.size() > 0)
modes += 'k'; modes += 'k';
if (_channel_size != -1) if(_channel_size != -1)
modes += 'l'; modes += 'l';
if (modes.size() <= 2) if(modes.size() <= 2)
return ; return ;
client->sendCode(RPL_CHANNELMODEIS, modes); client->sendCode(RPL_CHANNELMODEIS, modes);
} }
void Channel::changeMode(unstd::SharedPtr<class Client> client, const Message& msg) void Channel::changeMode(unstd::SharedPtr<class Client> client, const Message& msg)
{ {
bool modevalue = (msg.getTokens()[2][0] != '-'); bool modevalue = (msg.getTokens()[2][0] != '-');
// attention on est sur un truc solidement MERDIQUE, a toucher a tes propres risques (je suis proche du nervous breakdown) gl hf :)
logs::report(log_message, "tokensize : %d, mode : %c, modevalue %d", msg.getTokens().size(), msg.getTokens()[2][1], modevalue); logs::report(log_message, "tokensize : %d, mode : %c, modevalue %d", msg.getTokens().size(), msg.getTokens()[2][1], modevalue);
switch (msg.getTokens()[2][1]) switch(msg.getTokens()[2][1])
{ {
case 'i': case 'i': _invite_only = modevalue; break;
_invite_only = modevalue; case 't': _topic_op_restrict = modevalue; break;
break;
case 't':
_topic_op_restrict = modevalue;
break;
case 'k': case 'k':
if (modevalue && msg.getTokens().size() == 4)
{ {
logs::report(log_message, "%s password set as %s", getName().c_str(), msg.getTokens()[3].c_str()); if(modevalue && msg.getTokens().size() == 4)
_password = msg.getTokens()[3]; {
logs::report(log_message, "%s password set as %s", _name.c_str(), msg.getArgs()[2].c_str());
_password = msg.getArgs()[2];
} }
else if (msg.getTokens().size() < 4) else if(msg.getTokens().size() < 4)
{ {
_password = ""; _password.clear();
logs::report(log_message, "password removed on %s", getName().c_str()); logs::report(log_message, "password removed on %s", _name.c_str());
} }
break; break;
}
case 'o': case 'o':
if (isOp(client)) {
ModOperator(client, msg.getTokens()[3], modevalue); if(isOp(client))
else if (!isOp(client)) modOperator(client, msg.getTokens()[3], modevalue);
else if(!isOp(client))
client->sendCode(ERR_CHANOPRIVSNEEDED, "You need to be operator to execute this command"); client->sendCode(ERR_CHANOPRIVSNEEDED, "You need to be operator to execute this command");
break; break;
}
case 'l': case 'l':
if (msg.getTokens().size() < 3 && modevalue) {
return ; if(msg.getTokens().size() < 3 && modevalue)
if (!modevalue) return;
if(!modevalue)
{ {
_channel_size = -1; _channel_size = -1;
break ; break;
} }
if (modevalue) if(modevalue)
_channel_size = std::atoi(msg.getTokens()[3].c_str()); {
break ; char* end;
default : long tmp = std::strtol(msg.getArgs()[2].c_str(), &end, 10);
client->sendCode(":yipirc " ERR_UNKNOWNMODE " @", getName().c_str(), "Unknown mode"); if(errno == ERANGE || *end != 0 || tmp < 0)
return ; logs::report(log_error, "invalid channel size");
else
_channel_size = tmp;
}
break;
}
default : client->sendCode(":yipirc " ERR_UNKNOWNMODE " @", getName().c_str(), "Unknown mode"); return;
} }
logs::report(log_message, "%s MODES : i:%d t:%d k:%s l:%d", getName().c_str(), _invite_only, _topic_op_restrict, _password.c_str(), _channel_size); logs::report(log_message, "%s MODES : i:%d t:%d k:%s l:%d", getName().c_str(), _invite_only, _topic_op_restrict, _password.c_str(), _channel_size);
showModesModify(client, msg); showModesModify(client, msg);

2
srcs/main.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/20 09:27:04 by maldavid #+# #+# */ /* Created: 2024/01/20 09:27:04 by maldavid #+# #+# */
/* Updated: 2024/01/30 17:16:04 by vvaas ### ########.fr */ /* Updated: 2024/01/30 17:35:22 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/

10
srcs/server_functions.cpp
View File

@@ -6,7 +6,7 @@
/* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: vvaas <vvaas@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */ /* Created: 2024/01/22 17:31:06 by maldavid #+# #+# */
/* Updated: 2024/01/30 17:15:46 by vvaas ### ########.fr */ /* Updated: 2024/01/30 17:35:15 by maldavid ### ########.fr */
/* */ /* */
/******************************************************************************/ /******************************************************************************/
@@ -60,7 +60,7 @@ namespace irc
std::string oldNick = (client->getNickName().size() > 0) ? client->getNickName() : msg.getTokens()[1]; // get nickname before /nick execution inside server (oldNick) std::string oldNick = (client->getNickName().size() > 0) ? client->getNickName() : msg.getTokens()[1]; // get nickname before /nick execution inside server (oldNick)
client->printUserHeader(); client->printUserHeader();
client->setNewNickName(msg.getTokens()[1]); client->setNewNickName(msg.getTokens()[1]);
for (client_it it = _client.begin(); it != _client.end(); ++it) for(client_it it = _client.begin(); it != _client.end(); ++it)
(*it)->sendMsg(oldNick, "NICK", msg.getTokens()[1]); (*it)->sendMsg(oldNick, "NICK", msg.getTokens()[1]);
client->welcome(); client->welcome();
std::cout << "new nickname, " << client->getNickName() << std::endl; std::cout << "new nickname, " << client->getNickName() << std::endl;
@@ -74,12 +74,12 @@ namespace irc
logs::report(log_error, "USER, invalid command '%s'", msg.getRawMsg().c_str()); logs::report(log_error, "USER, invalid command '%s'", msg.getRawMsg().c_str());
return; return;
} }
if (client->isRegistered()) if(client->isRegistered())
{ {
client->sendCode(ERR_ALREADYREGISTRED, "You are already registered"); client->sendCode(ERR_ALREADYREGISTRED, "You are already registered");
return ; return ;
} }
if (msg.getTokens()[4][0] != ':') if(msg.getTokens()[4][0] != ':')
return ; return ;
client->printUserHeader(); client->printUserHeader();
client->setNewUserName(msg.getTokens()[1]); client->setNewUserName(msg.getTokens()[1]);
@@ -88,7 +88,7 @@ namespace irc
client->printUserHeader(); client->printUserHeader();
std::string realname; std::string realname;
for (std::vector<std::string>::const_iterator it = msg.getTokens().begin() + 4; it != msg.getTokens().end(); ++it) for(std::vector<std::string>::const_iterator it = msg.getTokens().begin() + 4; it != msg.getTokens().end(); ++it)
{ {
realname.append(*it); realname.append(*it);
realname.append(" "); realname.append(" ");