roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-28 21:07:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: handle when recv returns 0 or 1

Browse Source
This commit is contained in:
3lswear
2022-02-20 16:10:05 +03:00
parent b8f671d526
commit 4ad745a9e9
1 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/Server/Server.cpp
View File

@@ -110,46 +110,39 @@ void Server::sendData(Client &client, int fd)
void Server::readSocket(Client &client, int fd) void Server::readSocket(Client &client, int fd)
{ {
int status; int status;
int bytes_read; int bytes_read;
// char buf[BUFFSIZE + 1];
std::string stringBUF(BUFFSIZE, 0); std::string stringBUF(BUFFSIZE, 0);
DBOUT << TURQ << "IN readSocket" << ENDL; DBOUT << TURQ << "IN readSocket" << ENDL;
DBOUT << "client in readSocket "<< &client << ENDL; // DBOUT << "client in readSocket "<< &client << ENDL;
bytes_read = recv(fd, &stringBUF[0], BUFFSIZE, 0); bytes_read = recv(fd, &stringBUF[0], BUFFSIZE, 0);
if (bytes_read == 0) if (bytes_read == 0)
{ {
DBOUT << RED << "bytes_read = 0" << ENDL; DBOUT << RED << "bytes_read 0" << ENDL;
client.allRead = true; client.done = true;
throw std::logic_error("JOPA CLIENTU");
return;
} }
/* else if (bytes_read == -1) */ else if (bytes_read == -1)
/* throw std::logic_error("JOPA CLIENTU"); */
// buf[bytes_read + 1] = '\0';
// DBOUT << stringBUF << ENDL;
stringBUF.erase(bytes_read, stringBUF.size());
/* DBOUT << "after erase" <<ENDL; */
/* DBOUT << stringBUF << ENDL; */
client.setRawData(stringBUF);
// client.setRawData(buf);
client.increaseRecvCounter(bytes_read);
status = client.parseRequest();
(void)status;
// client_map[fd].printClientInfo();
if (client.allRecved())
{ {
DBOUT << RED << "bytes_read -1" << ENDL;
client.allRead = true; client.allRead = true;
} }
else
{
stringBUF.erase(bytes_read, stringBUF.size());
client.setRawData(stringBUF);
client.increaseRecvCounter(bytes_read);
status = client.parseRequest();
// client.printClientInfo();
if (client.allRecved())
client.allRead = true;
DBOUT << GREEN << "recvCounter " << client.getRecvCounter() << ENDL; DBOUT << GREEN << "recvCounter " << client.getRecvCounter() << ENDL;
DBOUT << GREEN << "contentLength " << client.getRequest().getContentLength() << ENDL; DBOUT << GREEN << "contentLength " << client.getRequest().getContentLength() << ENDL;
DBOUT << GREEN << "allRead " << client.allRead << ENDL; DBOUT << GREEN << "allRead " << client.allRead << ENDL;
DBOUT << BLUE << "status is " << Response::getReasonPhrase(status) << ENDL; DBOUT << BLUE << "status is " << Response::getReasonPhrase(status) << ENDL;
}
} }
int Server::delete_client(std::map<int, Client *> &client_map, int fd) int Server::delete_client(std::map<int, Client *> &client_map, int fd)