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

fix: compile errors after merge

Browse Source
This commit is contained in:
3lswear
2022-01-28 21:05:58 +03:00
parent f147123f88
commit 4f918a3fc9
2 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Server/Server.cpp
View File

@@ -83,28 +83,17 @@ void Server::add_to_epoll_list(int fd)
void Server::start(void) void Server::start(void)
{ {
Socket serverSocket(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1");
char buff[BUFFSIZE + 1] = {0};
Header header;
int fd_accept;
int code;
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 nfds; */
int client_sock; int client_sock;
int status; /* int status; */
int ready_num = 0; int ready_num = 0;
/* struct epoll_event ev; */ /* struct epoll_event ev; */
/* ev.events = EPOLLIN | EPOLLOUT | EPOLLET; */
/* 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);
@@ -134,11 +123,11 @@ void Server::start(void)
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_map[fd].setRawData(buf); header_map[fd].setRawData(buf);
status = header_map[fd].parseRequest(); header_map[fd].parseRequest();
header_map[fd].printInfo(); header_map[fd].printHeaderInfo();
header_map[fd].sendResponse(fd); header_map[fd].sendRespons(fd);
header_map[fd].clear(); header_map[fd].clear();
std::cout << BLUE << "status is " << Header::getReasonPhrase(status) << RESET << std::endl; /* std::cout << BLUE << "status is " << header_map[fd].getReasonPhrase(status) << RESET << std::endl; */
bzero(buf, BUFFSIZE); bzero(buf, BUFFSIZE);
close(fd); close(fd);
_client--; _client--;
@@ -148,26 +137,6 @@ void Server::start(void)
} }
close(server_sock.getSocketFd()); close(server_sock.getSocketFd());
std::cerr << "end;" << std::endl; std::cerr << "end;" << std::endl;
/* Socket serverSocket(AF_INET, SOCK_STREAM, 0, _port, "127.0.0.1"); */
/* char buff[BUFFSIZE + 1] = {0}; */
/* Header header; */
/* int fd_accept; */
/* int code; */
/* checkError(serverSocket.init(MAX_CLIENT), "Socket init"); */
/* fd_accept = accept(serverSocket.getSocketFd(), */
/* serverSocket.getSockaddr(), serverSocket.getSocklen()); */
/* checkError(fd_accept, "Initialize client socket"); */
/* checkError(recv(fd_accept, buff, BUFFSIZE, 0), "Receive msg from client"); */
/* std::cout << TURGUOISE << "Receive Header" << ZERO_C << std::endl; */
/* header.setRawData(buff); */
/* code = header.parseRequest(); */
/* header.printHeaderInfo(); */
/* header.sendRespons(fd_accept); */
/* std::cout << BLUE << header.getReasonPhrase(code) << ZERO_C << std::endl; */
/* close(fd_accept); */
/* close(serverSocket.getSocketFd()); */
} }

2
src/Server/Server.hpp
View File

@@ -18,7 +18,7 @@ private:
struct epoll_event _events[MAX_CLIENT]; struct epoll_event _events[MAX_CLIENT];
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: