Skip to content

Commit

Permalink
Merge branch 'hae_parse' of github.com:haelime/IRCPP into hae_parse
Browse files Browse the repository at this point in the history
  • Loading branch information
@haelime
haelime committed Mar 28, 2024
2 parents 9597668 + c61cbfc commit 6383a7c
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 91 deletions.
4 changes: 2 additions & 2 deletions include/Server.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Server

// Try parse RecvMsg
// ClientData Does NOTHING about this recvMsg, only server will handle it.
bool parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>& receivedRequest);
bool parseReceivedRequestFromClientData(SOCKET_FD client);

void enqueueParsedMessages(ClientData* clientData);
bool isValidParameter(char c) const;
Expand Down Expand Up @@ -80,7 +80,7 @@ class Server
std::map<std::string, ClientData*> mNickToClientGlobalMap;
std::map<std::string, Channel*> mNameToChannelGlobalMap;

std::queue<std::pair<SOCKET_FD, std::string> > mClientRecvMsgQueue;
std::queue<SOCKET_FD> mClientRecvProcessQueue;

time_t mServerStartTime;
time_t mServerLastPingTime; //< to kick if not received in 2 seconds
Expand Down
1 change: 1 addition & 0 deletions include/types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ struct Message
bool mHasPrefix;

Command mCommand;
// TODO : check parameter's max size
std::vector <std::string> mParams;
};
130 changes: 41 additions & 89 deletions srcs/Server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ void Server::run()

// Find the clientData
Logger::log(DEBUG, "Finding clientData object");
// TODO : change to .find() instead of operator[] for preventing creating new ClientData object when not found
ClientData* clientData = mFdToClientGlobalMap[filteredEvents[i].ident]; // cuz it's map, it's O(logN)
delete clientData;
Logger::log(DEBUG, "ClientData object deleted");
Expand Down Expand Up @@ -195,6 +196,7 @@ void Server::run()

Logger::log(INFO, "New client connected");

// TODO : change log format
Logger::log(DEBUG, "|-----------------------------------------");
Logger::log(DEBUG, "SocketDescriptor : " + ValToString(newClientSocket));
Logger::log(DEBUG, "IP : " + std::string(inet_ntoa(newClientAddress.sin_addr)));
Expand Down Expand Up @@ -248,6 +250,7 @@ void Server::run()

// it's same as mFdToClientGlobalMap.insert(std::pair<SOCKET_FD, ClientData*>(newClientSocket, newClientData));
Logger::log(DEBUG, "Adding new clientData object to map");
mFdToClientGlobalMap.insert(std::pair<SOCKET_FD, ClientData*>(newClientSocket, newClientData));
mFdToClientGlobalMap[newClientSocket] = newClientData;
Logger::log(DEBUG, "New clientData object added to map");
}
Expand Down Expand Up @@ -305,7 +308,7 @@ void Server::run()
// Handle message
// Push message to message Queue with it's clientData information
Logger::log(DEBUG, "Pushing message to serverDataQueue");
mClientRecvMsgQueue.push(std::pair<SOCKET_FD, std::string>(filteredEvents[i].ident, std::string(recvMsg, recvMsgLength)));
Server::mClientRecvProcessQueue.push(filteredEvents[i].ident);
std::string recvMsgStr(recvMsg, recvMsgLength);
clientData->appendReceivedString(recvMsgStr);

Expand Down Expand Up @@ -343,16 +346,16 @@ void Server::run()

// TODO : push messages to clients
// we must check message's validity, hence we need to parse it, and store it in the clientData object
while (!mClientRecvMsgQueue.empty())
while (!mClientRecvProcessQueue.empty())
{
// send receivedRequest to clientData, and server will handle the message
std::pair<SOCKET_FD, std::string>& receivedRequest = mClientRecvMsgQueue.front();
SOCKET_FD client = mClientRecvProcessQueue.front();
Logger::log(DEBUG, "Parsing received message to clientData object");

if (parseReceivedRequestToClientData(receivedRequest) == true)
if (parseReceivedRequestFromClientData(client) == true)
{
Logger::log(DEBUG, "Message parsed successfully");
SOCKET_FD clientFD = receivedRequest.first;
SOCKET_FD clientFD = client;
// This logic Takes O(log N), probably can optimize it
std::map<SOCKET_FD, ClientData*>::const_iterator clientDataIter = mFdToClientGlobalMap.find(clientFD);
ClientData* clientData = (*clientDataIter).second;
Expand All @@ -369,7 +372,7 @@ void Server::run()
Logger::log(DEBUG, "Sending parsed message to clientData object");
enqueueParsedMessages(clientData);
}
mClientRecvMsgQueue.pop();
mClientRecvProcessQueue.pop();
}
}
}
Expand Down Expand Up @@ -664,10 +667,9 @@ bool Server::setPortAndPassFromArgv(int argc, char** argv)
return true;
}

bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>& receivedRequest)
bool Server::parseReceivedRequestFromClientData(SOCKET_FD client)
{
SOCKET_FD clientFD = receivedRequest.first;
std::string receivedString = receivedRequest.second;
SOCKET_FD clientFD = client;

std::map<SOCKET_FD, ClientData*>::const_iterator clientDataIter = mFdToClientGlobalMap.find(clientFD);
if (clientDataIter == mFdToClientGlobalMap.end())
Expand All @@ -678,11 +680,9 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&
}
ClientData* clientData = (*clientDataIter).second;

Logger::log(INFO, "Received message from " + clientData->getIp() + " : " + receivedString);

// should erase and setReceivedString() if the message has been parsed
std::string originStr = clientData->getReceivedString();
std::string str = originStr;
std::string str = clientData->getReceivedString();

Logger :: log (DEBUG, "Trying to parse message with : \"" + str + "\"");
if (str.length() < 2)
Expand All @@ -697,98 +697,46 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&
assert(false);
return false;
}
std::stringstream ss;

ss << str;
if (ss.fail())
{
Logger::log(WARNING, "Failed to parse message");
assert(false);
return false;
}
std::string rawMessage;
// check if the message is completed and cut the message by CR LF
if (!getline(ss, rawMessage, '\r'))
{
Logger::log(WARNING, "Message is not completed yet");
assert(false);
return false;
}
if (ss.fail())
{
Logger::log(WARNING, "Failed to parse message");
assert(false);
return false;
}
// rawMessage

Logger::log(DEBUG, "Printing str : ");
logHasStrCRLF(str);
Logger::log(DEBUG, "Printing rawMessage : ");
logHasStrCRLF(rawMessage);


// old logic
// size_t crIndex = str.find('\r');
// size_t crIndex = 0;
// for (int i = 0; i < int(str.length()) - 1; i++)
// {
// if (str[i] == '\r' && str[i + 1] == '\n')
// {
// crIndex = i;
// break;
// }
// }
// if (crIndex == str.npos) //< not found
// {
// Logger::log(WARNING, "Message is not completed yet");
// return false;
// }
// std::string::iterator strIter = str.begin() + crIndex;
// strIter++;
// if (strIter == str.end())
// {
// Logger::log(WARNING, "Message is not completed yet");
// return false;
// }
// if (*strIter != '\n')
// {
// Logger::log(WARNING, "Invalid message");
// return false;
// }

Logger::log(DEBUG, "Raw message : " + rawMessage);
if (isValidMessage(rawMessage) == false)
std::string target ("\r\n");
std::size_t pos = str.find(target);
if (pos == std::string::npos)
{
Logger::log(WARNING, "Invalid message");
Logger::log(ERROR, "Message is not completed yet");
assert(false);
return false;
}

// remove the rawMessage from receivedString





// parse the rawMessage
Message message;

// parse prefix

// <message> ::= [':' <prefix> <SPACE> ] <command> <params> <crlf>
// <prefix> ::= <servername> | <nick> [ '!' <user> ] [ '@' <host> ]

if (rawMessage[0] == ':')
// DON'T BELIVE THIS LOGIC
if (str[0] == ':')
{
size_t spaceIndex = rawMessage.find(' ');
if (spaceIndex == rawMessage.npos)
size_t spaceIndex = str.find(' ');
if (spaceIndex == str.npos)
{
Logger::log(ERROR, "Invalid message");
assert(false);
return false;
}
std::string::iterator prefixIter = rawMessage.begin() + spaceIndex;
std::string::iterator prefixIter = str.begin() + spaceIndex;

// cut the prefix
std::string tmpPrefix = rawMessage.substr(1, prefixIter - rawMessage.begin());
rawMessage = rawMessage.substr(prefixIter - rawMessage.begin() + 1);
std::string tmpPrefix = str.substr(1, prefixIter - str.begin());
str = str.substr(prefixIter - str.begin() + 1);

if (mNickToClientGlobalMap.find(tmpPrefix) != mNickToClientGlobalMap.end())
{
Expand Down Expand Up @@ -831,21 +779,22 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&
// · l: Set/remove the user limit to channel
// parse command

// size_t spaceIndex = rawMessage.find(' ');
// if (spaceIndex == rawMessage.npos)
// size_t spaceIndex = str.find(' ');
// if (spaceIndex == str.npos)
// {
// Logger::log(ERROR, "Invalid message");
// assert(false);
// return false;
// }
// std::string::iterator commandIter = rawMessage.begin() + spaceIndex;
// std::string::iterator commandIter = str.begin() + spaceIndex;

// // message is already cut by CR LF, so we start from 0
// std::string commandStr = rawMessage.substr(0, commandIter - rawMessage.begin());
// rawMessage = rawMessage.substr(commandIter - rawMessage.begin() + 1);
// std::string commandStr = str.substr(0, commandIter - str.begin());
// str = str.substr(commandIter - str.begin() + 1);

// DON'T BELIVE THIS LOGIC
std::string commandStr;
if (std::getline(ss, commandStr, ' '))
// if (std::getline(ss, commandStr, ' '))
{
for (size_t i = 0; i < commandStr.length(); i++)
{
Expand Down Expand Up @@ -908,9 +857,10 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&

message.mCommand = command;

// DON'T BELIVE THIS LOGIC
// parse params
std::string params;
std::getline(ss, params, '\r');
// std::getline(ss, params, '\r');
// check params and push it to message's params vector
std::string::iterator paramsIter = params.begin();
while (paramsIter != params.end())
Expand All @@ -929,6 +879,7 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&
return false;
}
}
// TODO : consider emplace_back
message.mParams.push_back(tmpParam);
break;
}
Expand All @@ -946,6 +897,7 @@ bool Server::parseReceivedRequestToClientData(std::pair<SOCKET_FD, std::string>&
paramsIter = nextParamsIter + 1;
}

// CONSIDER MULTIPLE MESSAGES
clientData->getParsedMessageQueue().push(message);

return true;
Expand Down Expand Up @@ -1008,17 +960,17 @@ void Server::logHasStrCRLF(const std::string &str)
{
if (str[i] == '\r')
{
Logger::log(DEBUG, str + "has CR");
Logger::log(DEBUG, str + " has CR");
found = 1;
}
else if (str[i] == '\n')
{
Logger::log(DEBUG, str + "has LF");
Logger::log(DEBUG, str + " has LF");
found = 1;
}
}
if (!found)
Logger::log(DEBUG, str + "has no CRLF");
Logger::log(DEBUG, str + " has no CRLF");
}

bool Server::isValidCommand(char c) const
Expand Down

0 comments on commit 6383a7c

Please sign in to comment.