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

refactor: some refactors

Browse Source
This commit is contained in:
3lswear
2022-01-25 23:50:42 +03:00
parent 150447c58c
commit 1602a1ec35
2 changed files with 40 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/Server/Server.cpp
View File

@@ -1,5 +1,6 @@
#include "Server.hpp" #include "Server.hpp"
#include <exception> #include <exception>
#include <cassert>
#define THREAD_NUM 100 #define THREAD_NUM 100
#define MAX_EVENTS #define MAX_EVENTS
@@ -25,7 +26,7 @@ void Server::readConfig(void)
TOMLMap *root = parse(); TOMLMap *root = parse();
TOMLMap *map; /* TOMLMap *map; */
TOMLMap::iterator it1; TOMLMap::iterator it1;
TOMLMapArray *arr; TOMLMapArray *arr;
TOMLMapArray::iterator it; TOMLMapArray::iterator it;
@@ -34,21 +35,21 @@ void Server::readConfig(void)
arr = root->find("server")->second->getMapArray(); arr = root->find("server")->second->getMapArray();
it = arr->begin(); it = arr->begin();
while (it != arr->end()) /* while (it != arr->end()) */
{ /* { */
std::cout << BLUE << *it << std::endl; /* std::cout << BLUE << *it << std::endl; */
map = *it; /* map = *it; */
it1 = map->begin(); /* it1 = map->begin(); */
while (it1 != map->end()) /* while (it1 != map->end()) */
{ /* { */
std::cout << TURGUOISE << it1->first << it1->second << ZERO_C << std::endl; /* std::cout << TURGUOISE << it1->first << it1->second << ZERO_C << std::endl; */
++it1; /* ++it1; */
} /* } */
++it; /* ++it; */
} /* } */
@@ -62,12 +63,12 @@ void Server::setupConfig(void)
} }
void Server::setNonblocking(int fd) void Server::setNonBlock(int fd)
{ {
fcntl(fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
} }
void Server::newConnection(int fd) void Server::add_to_epoll_list(int fd)
{ {
struct epoll_event ev; struct epoll_event ev;
ev.events = EPOLLIN | EPOLLOUT | EPOLLET; ev.events = EPOLLIN | EPOLLOUT | EPOLLET;
@@ -77,15 +78,15 @@ void Server::newConnection(int fd)
_client++; _client++;
} }
void Server::add_to_epoll_list(int fd, unsigned int ep_events) /* void Server::add_to_epoll_list(int fd, unsigned int ep_events) */
{ /* { */
struct epoll_event event; /* struct epoll_event event; */
event.data.fd = fd; /* event.data.fd = fd; */
event.events = ep_events; /* event.events = ep_events; */
if (epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &event)) /* if (epoll_ctl(_epoll_fd, EPOLL_CTL_ADD, fd, &event)) */
throw std::logic_error("epoll add"); /* throw std::logic_error("epoll add"); */
} /* } */
void Server::start(void) void Server::start(void)
{ {
@@ -97,43 +98,45 @@ void Server::start(void)
/* int n; */ /* int n; */
/* int nfds; */ /* int nfds; */
int client_sock; int client_sock;
int code; int status;
int epoll_ret = 0; int epoll_ret = 0;
/* int epollfd; */ /* int epollfd; */
struct epoll_event ev; /* struct epoll_event ev; */
ev.events = EPOLLIN | EPOLLOUT | EPOLLET; /* ev.events = EPOLLIN | EPOLLOUT | EPOLLET; */
/* ev.data.fd */ /* ev.data.fd */
/* unsigned int ep_events = EPOLLIN | EPOLLOUT | EPOLLET; */ /* unsigned int ep_events = EPOLLIN | EPOLLOUT | EPOLLET; */
_epoll_fd = epoll_create1(0); _epoll_fd = epoll_create1(0);
checkError(server_sock.init(MAX_CLIENT), "Socket init"); checkError(server_sock.init(MAX_CLIENT), "Socket init");
setNonblocking(server_sock.getSocketFd()); setNonBlock(server_sock.getSocketFd());
setNonblocking(_epoll_fd); setNonBlock(_epoll_fd);
while (1) while (1)
{ {
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)
newConnection(client_sock); add_to_epoll_list(client_sock);
if (_client > 0) if (_client > 0)
epoll_ret = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1); epoll_ret = epoll_wait(_epoll_fd, _events, MAX_CLIENT, -1);
if (epoll_ret < 0) if (epoll_ret < 0)
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 < epoll_ret; i++)
{ {
/* if (_events[i].events == 0) */
/* continue; */
fd = _events[i].data.fd; fd = _events[i].data.fd;
checkError(recv(fd, buf, BUFFSIZE, 0), "Receive msg from client"); checkError(recv(fd, buf, BUFFSIZE, 0), "Receive msg from client");
header[fd].setRawData(buf); header[fd].setRawData(buf);
code = header[fd].parseRequest(); status = header[fd].parseRequest();
header[fd].printHeaderInfo(); header[fd].printInfo();
header[fd].printHeaderInfo(); header[fd].printInfo();
header[fd].sendRespons(fd); header[fd].sendResponse(fd);
header[fd].clear(); header[fd].clear();
std::cout << BLUE << header[fd].getReasonPhrase(code) << ZERO_C << std::endl; std::cout << BLUE << header[fd].getReasonPhrase(status) << ZERO_C << std::endl;
close(fd); close(fd);
_client--; _client--;
} }
@@ -143,51 +146,6 @@ void Server::start(void)
close(server_sock.getSocketFd()); close(server_sock.getSocketFd());
std::cerr << "end;" << std::endl; std::cerr << "end;" << std::endl;
// nfds = 0;
// n = 0;
// _epolfd = epoll_create1(0);
// checkError(serverSocket.init(MAX_CLIENT), "Socket init");
// setNonblocking(serverSocket.getSocketFd());
// setNonblocking(_epolfd);
// while (true)
// {
// _clientSocket = accept(serverSocket.getSocketFd(),
// serverSocket.getSockaddr(), serverSocket.getSocklen());
// if (_clientSocket > 0)
// newConnection(_clientSocket);
// if (_client > 0)
// nfds = epoll_wait(_epolfd, _events, MAX_CLIENT, -1);
// while (n < nfds)
// {
// fd = _events[n].data.fd;
// // std::cout << "n = " << n << " nfds = " << nfds << " fd = " << fd << " _clientSize = " << _client << " _clientSocket " << _clientSocket << std::endl;
// checkError(recv(fd, buff, BUFFSIZE, 0), "Receive msg from client");
// header[fd].setRequest(buff);
// header[fd].parseRequest();
// header[fd].printHeaderInfo();
// sendRespons(header[fd], fd);
// header[fd].clearHeader();
// close(fd);
// _client--;
// n++;
// }
// n = 0;
// nfds = 0;
// _clientSocket = 0;
// }
// close(serverSocket.getSocketFd());
//
/* Socket serverSocket(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1"); */ /* Socket serverSocket(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1"); */
/* char buff[BUFFSIZE + 1] = {0}; */ /* char buff[BUFFSIZE + 1] = {0}; */
/* Header header; */ /* Header header; */

6
src/Server/Server.hpp
View File

@@ -19,15 +19,15 @@ 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);
void sendFile(std::string str); void sendFile(std::string str);
void sendHeader(Header head, int); void sendHeader(Header head, int);
void sendRespons(Header head, int); void sendRespons(Header head, int);
void setNonblocking(int fd); void setNonBlock(int fd);
void newConnection(int fd); void add_to_epoll_list(int fd);
public: public:
Server(); Server();
Server(std::string path); Server(std::string path);