42/42_INT_12_webserv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review parsing Eric and Luke.

Browse Source 
Combined the config parser with Webserv class.
This commit is contained in:
LuckyLaszlo
2022-07-31 00:27:48 +02:00
parent 2d91b704c3
commit e5c2869172
10 changed files with 76 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
srcs/Webserv.hpp
View File

@@ -24,21 +24,25 @@
# include <fcntl.h> // fcntl
# include "Client.hpp"
# include "Server.hpp"
# include "ConfigParser.hpp"
# include "ServerConfig.hpp"
// TODO: A virer
# include "ConfigParser.hpp"
# include "LocationConfig.hpp"
# include "MethodType.hpp"
# include "utils.hpp"
// TODO: A virer
# include <csignal> // signal
# include <unistd.h>
# include <string.h>
# include <stdio.h>
# include <stdlib.h>
# include <cstdlib> // itoa
# include <cstdlib> // atoi, itoa
# include <fstream> // ifstream
char *ft_itoa(int n);
# include <unistd.h> // access
# include <algorithm> // find
extern bool g_run;
extern int g_last_signal;
@@ -75,14 +79,14 @@ class Webserv
// Webserv &operator=(Webserv const &rhs);
// init.cpp
void init_virtual_servers(); // ADD config param
void init_virtual_servers(std::vector<ServerConfig>* servers);
// run_loop.cpp
void run();
private:
int _epfd;
int _socket_fd; // temp, to replace with std::vector<Server>
// std::vector<Server> _servers;
std::vector<int> _listen_sockets;
std::vector<ServerConfig> _servers;
std::vector<Client> _clients;
// accept.cpp
@@ -105,7 +109,7 @@ class Webserv
void _close_client(int fd);
void _close_all_clients();
// init.cpp
void _bind(int socket_fd, in_port_t port);
void _bind(int socket_fd, in_port_t port, std::string host);
void _listen(int socket_fd, unsigned int max_connections);
};