From 4f918a3fc9acca3dfc1f092e813d889fc62e9253 Mon Sep 17 00:00:00 2001
From: 3lswear <r.malyavsky@protonmail.com>
Date: Fri, 28 Jan 2022 21:05:58 +0300
Subject: [PATCH] fix: compile errors after merge

---
 src/Server/Server.cpp | 41 +++++------------------------------------
 src/Server/Server.hpp |  2 +-
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/src/Server/Server.cpp b/src/Server/Server.cpp
index 1e7b648..0a9dd80 100644
--- a/src/Server/Server.cpp
+++ b/src/Server/Server.cpp
@@ -83,28 +83,17 @@ void	Server::add_to_epoll_list(int fd)
 
 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");
 	char buf[BUFFSIZE + 1] = {0};
 	/* Header header[MAX_CLIENT]; */
 	std::map<int, Header> header_map;
 	int fd;
-	/* int n; */
-	/* int nfds; */
 	int client_sock;
-	int status;
+	/* int status; */
 	int ready_num = 0;
 
 	/* struct epoll_event ev; */
 
-	/* ev.events = EPOLLIN | EPOLLOUT | EPOLLET; */
-	/* ev.data.fd */ 
-
 	/* unsigned int ep_events = EPOLLIN | EPOLLOUT | EPOLLET; */
 	
 	_epoll_fd = epoll_create1(0);
@@ -134,11 +123,11 @@ void	Server::start(void)
 			fd = _events[i].data.fd;
 			assert(recv(fd, buf, BUFFSIZE, 0) >= 0);
 			header_map[fd].setRawData(buf);
-			status = header_map[fd].parseRequest();
-			header_map[fd].printInfo();
-			header_map[fd].sendResponse(fd);
+			header_map[fd].parseRequest();
+			header_map[fd].printHeaderInfo();
+			header_map[fd].sendRespons(fd);
 			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);
 			close(fd);
 			_client--;
@@ -148,26 +137,6 @@ void	Server::start(void)
 	}
 	close(server_sock.getSocketFd());
 	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()); */
 }
 
 
diff --git a/src/Server/Server.hpp b/src/Server/Server.hpp
index 61ca6a2..8cef036 100644
--- a/src/Server/Server.hpp
+++ b/src/Server/Server.hpp
@@ -18,7 +18,7 @@ private:
 	struct epoll_event	_events[MAX_CLIENT];
 	struct sockaddr_in _addres;
 	std::string _ip;
-	std::vector<ServerConfig>	_configs;
+	std::vector<ServerConfig *>	_configs;
 	/* void add_to_epoll_list(int fd, unsigned int ep_events); */
 
 private: