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

Merge remote-tracking branch 'origin/roman' into fara

Browse Source
This commit is contained in:
Talyx
2022-01-30 11:48:57 +03:00
parent 3eda24edb1 4ebce356a1
commit b55aa0b977
4 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Client/Client.cpp
View File

@@ -57,7 +57,6 @@ void Client::setFd(int fd)
this->_fd = fd; this->_fd = fd;
} }
//-------------------------------------------------Parsing--------------------------------------- //-------------------------------------------------Parsing---------------------------------------
int Client::parseRequest(void) int Client::parseRequest(void)

76
src/Server/Server.cpp
View File

@@ -56,82 +56,76 @@ void Server::setNonBlock(int fd)
fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
} }
void Server::add_to_epoll_list(int fd) void Server::add_to_epoll_list(int fd, unsigned int ep_events)
{ {
struct epoll_event ev; struct epoll_event ev;
ev.events = EPOLLIN | EPOLLOUT | EPOLLET; ev.events = ep_events;
ev.data.fd = fd; ev.data.fd = fd;
epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &ev); assert(epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &ev) == 0);
_client++; _client++;
std::cerr << RED std::cerr << YELLO
<< "add client_sock " << "add socket "
<< fd << fd
<< " to epoll_list" << " to epoll_list"
<< RESET << std::endl; << RESET << std::endl;
} }
/* void Server::add_to_epoll_list(int fd, unsigned int ep_events) */
/* { */
/* struct epoll_event event; */
/* event.data.fd = fd; */
/* event.events = ep_events; */
/* if (epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &event)) */
/* throw std::logic_error("epoll add"); */
/* } */
void Server::start(void) 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] = {0};
/* Client Client[MAX_CLIENT]; */ std::map<int, Client> client_map;
std::map<int, Client> Client_map;
int fd; int fd;
int client_sock; int status;
/* int status; */
int ready_num = 0; int ready_num = 0;
/* struct epoll_event ev; */ unsigned int client_events = EPOLLIN | EPOLLOUT | EPOLLET;
unsigned int server_events = EPOLLIN | EPOLLOUT | EPOLLET;
/* unsigned int ep_events = EPOLLIN | EPOLLOUT | EPOLLET; */ _epoll_fd = epoll_create(1337);
_epoll_fd = epoll_create1(0);
checkError(server_sock.init(MAX_CLIENT), "Socket init"); checkError(server_sock.init(MAX_CLIENT), "Socket init");
setNonBlock(server_sock.getSocketFd()); setNonBlock(server_sock.getSocketFd());
setNonBlock(_epoll_fd); setNonBlock(_epoll_fd);
std::cerr << YELLO << "adding server_sock..." << RESET << std::endl;
add_to_epoll_list(server_sock.getSocketFd(), server_events);
while (1) while (1)
{ {
client_sock = accept(server_sock.getSocketFd(),
server_sock.getSockaddr(), server_sock.getSocklen());
if (client_sock > 0)
add_to_epoll_list(client_sock);
if (_client > 0)
ready_num = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1); ready_num = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1);
/* std::cout << GREEN << "after epoll_wait" << RESET << std::endl; */
if (ready_num < 0) if (ready_num < 0)
{
perror("epoll_ret");
throw std::logic_error("epoll_ret"); throw std::logic_error("epoll_ret");
}
for (int i = 0; i < ready_num; i++) for (int i = 0; i < ready_num; i++)
{ {
/* if (_events[i].events == 0) */ /* if (_events[i].events == 0) */
/* continue; */ /* continue; */
std::cout << TURQ << "IN FOR LOOP" << RESET << std::endl;
fd = _events[i].data.fd; fd = _events[i].data.fd;
if (fd == server_sock.getSocketFd())
{
int client_sock = accept(server_sock.getSocketFd(),
server_sock.getSockaddr(), server_sock.getSocklen());
if (client_sock > 0)
add_to_epoll_list(client_sock, client_events);
else
throw std::logic_error("accept didnt work");
}
else
{
std::cout << TURQ << "IN FOR LOOP" << RESET << std::endl;
assert(recv(fd, buf, BUFFSIZE, 0) >= 0); assert(recv(fd, buf, BUFFSIZE, 0) >= 0);
Client_map[fd].setRawData(buf); client_map[fd].setRawData(buf);
Client_map[fd].parseRequest(); status = client_map[fd].parseRequest();
Client_map[fd].printClientInfo(); client_map[fd].printClientInfo();
Client_map[fd].sendResponse(fd); client_map[fd].sendResponse(fd);
Client_map[fd].clear(); client_map[fd].clear();
/* std::cout << BLUE << "status is " << Client_map[fd].getReasonPhrase(status) << RESET << std::endl; */ client_map.erase(fd);
std::cout << BLUE << "status is " << Response::getReasonPhrase(status) << RESET << std::endl;
bzero(buf, BUFFSIZE); bzero(buf, BUFFSIZE);
close(fd); close(fd);
_client--; _client--;
} }
}
ready_num = 0; ready_num = 0;
} }

3
src/Server/Server.hpp
View File

@@ -19,7 +19,7 @@ private:
struct sockaddr_in _addres; struct sockaddr_in _addres;
std::string _ip; std::string _ip;
std::vector<ServerConfig *> _configs; std::vector<ServerConfig *> _configs;
/* void add_to_epoll_list(int fd, unsigned int ep_events); */ void add_to_epoll_list(int fd, unsigned int ep_events);
private: private:
void checkError(int fd, std::string str); void checkError(int fd, std::string str);
@@ -27,7 +27,6 @@ private:
void sendClient(Client head, int); void sendClient(Client head, int);
void sendResponse(Client head, int); void sendResponse(Client head, int);
void setNonBlock(int fd); void setNonBlock(int fd);
void add_to_epoll_list(int fd);
public: public:
Server(); Server();
Server(std::string path); Server(std::string path);