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

fix: readSocket

Browse Source
This commit is contained in:
3lswear
2022-01-30 15:28:24 +03:00
parent cba4c8adf3
commit 7ce1c43758
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Server/Server.cpp
View File

@@ -10,6 +10,7 @@
//----------------------------------------------Constructors----------------------------------------------------------------------------------- //----------------------------------------------Constructors-----------------------------------------------------------------------------------
Server::Server() Server::Server()
{ {
bzero(_events, sizeof(_events));
_client = 0; _client = 0;
} }
@@ -73,17 +74,28 @@ void Server::readSocket(int fd, std::map<int, Client> &client_map)
int bytes_read; int bytes_read;
char buf[BUFFSIZE + 1] = {0}; char buf[BUFFSIZE + 1] = {0};
std::cout << TURQ << "IN readSocket" << RESET << std::endl;
bytes_read = recv(fd, buf, BUFFSIZE, 0); bytes_read = recv(fd, buf, BUFFSIZE, 0);
if (bytes_read < BUFFSIZE) if (bytes_read == 0)
{ {
client_map[fd].allRead = true; client_map[fd].allRead = true;
if (bytes_read == 0) return;
return;
} }
client_map[fd].setRawData(buf); client_map[fd].setRawData(buf);
status = client_map[fd].parseRequest(); status = client_map[fd].parseRequest();
client_map[fd].increaseRecvCounter(bytes_read);
client_map[fd].printClientInfo(); client_map[fd].printClientInfo();
if ((bytes_read < BUFFSIZE) && client_map[fd].allRecved())
{
client_map[fd].allRead = true;
}
std::cerr << "bytes_read " << bytes_read << std::endl;;
std::cerr << "recvCounter " << client_map[fd].getRecvCounter() << std::endl;;
std::cerr << "contentLength " << client_map[fd].getRequest().getContentLength() << std::endl;
std::cerr << "allRead " << client_map[fd].allRead << std::endl;;
std::cout << BLUE << "status is " << Response::getReasonPhrase(status) << RESET << std::endl; std::cout << BLUE << "status is " << Response::getReasonPhrase(status) << RESET << std::endl;
bzero(buf, BUFFSIZE); bzero(buf, BUFFSIZE);
} }
@@ -157,7 +169,7 @@ void Server::start(void)
} }
if (client.allSended()) if (client.readyToSend() && client.allSended())
{ {
close(client_it->first); close(client_it->first);
std::cerr << RED << std::cerr << RED <<
@@ -180,6 +192,10 @@ void Server::start(void)
/* if (_events[i].events == 0) */ /* if (_events[i].events == 0) */
/* continue; */ /* continue; */
fd = _events[i].data.fd; fd = _events[i].data.fd;
/* if (_events[i].data.fd == 0) */
/* { */
/* continue; */
/* } */
if (fd == server_sock.getSocketFd()) if (fd == server_sock.getSocketFd())
{ {