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

feat: change to map of headers (wip)

Browse Source
This commit is contained in:
3lswear
2022-01-26 23:53:12 +03:00
parent 9725d2ea5c
commit 7e51f0aa3a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Server/Server.cpp
View File

@@ -100,14 +100,14 @@ void Server::start(void)
Socket server_sock(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1"); Socket server_sock(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1");
char buf[BUFFSIZE + 1] = {0}; char buf[BUFFSIZE + 1] = {0};
Header header[MAX_CLIENT]; /* Header header[MAX_CLIENT]; */
std::map<int, Header> header_map; std::map<int, Header> header_map;
int fd; int fd;
/* int n; */ /* int n; */
/* int nfds; */ /* int nfds; */
int client_sock; int client_sock;
int status; int status;
int epoll_ret = 0; int ready_num = 0;
/* struct epoll_event ev; */ /* struct epoll_event ev; */
@@ -122,19 +122,19 @@ void Server::start(void)
setNonBlock(_epoll_fd); setNonBlock(_epoll_fd);
while (1) while (1)
{ {
/* std::cout << RED << "IN MAIN LOOP" << RESET << std::endl; */
client_sock = accept(server_sock.getSocketFd(), client_sock = accept(server_sock.getSocketFd(),
server_sock.getSockaddr(), server_sock.getSocklen()); server_sock.getSockaddr(), server_sock.getSocklen());
if (client_sock > 0) if (client_sock > 0)
add_to_epoll_list(client_sock); add_to_epoll_list(client_sock);
if (_client > 0) if (_client > 0)
epoll_ret = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1); ready_num = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1);
if (epoll_ret < 0) /* std::cout << GREEN << "after epoll_wait" << RESET << std::endl; */
if (ready_num < 0)
{ {
perror("epoll_ret"); perror("epoll_ret");
throw std::logic_error("epoll_ret"); throw std::logic_error("epoll_ret");
} }
for (int i = 0; i < epoll_ret; i++) for (int i = 0; i < ready_num; i++)
{ {
/* if (_events[i].events == 0) */ /* if (_events[i].events == 0) */
/* continue; */ /* continue; */
@@ -142,17 +142,17 @@ void Server::start(void)
std::cout << TURQ << "IN FOR LOOP" << RESET << std::endl; std::cout << TURQ << "IN FOR LOOP" << RESET << std::endl;
fd = _events[i].data.fd; fd = _events[i].data.fd;
assert(recv(fd, buf, BUFFSIZE, 0) >= 0); assert(recv(fd, buf, BUFFSIZE, 0) >= 0);
header[fd].setRawData(buf); header_map[fd].setRawData(buf);
status = header[fd].parseRequest(); status = header_map[fd].parseRequest();
header[fd].printInfo(); header_map[fd].printInfo();
header[fd].sendResponse(fd); header_map[fd].sendResponse(fd);
header[fd].clear(); header_map[fd].clear();
std::cout << BLUE << "status is " << Header::getReasonPhrase(status) << RESET << std::endl; std::cout << BLUE << "status is " << Header::getReasonPhrase(status) << RESET << std::endl;
bzero(buf, BUFFSIZE); bzero(buf, BUFFSIZE);
close(fd); close(fd);
_client--; _client--;
} }
epoll_ret = 0; ready_num = 0;
} }
close(server_sock.getSocketFd()); close(server_sock.getSocketFd());