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

47
srcs/webserv/init.cpp
View File

@@ -1,23 +1,43 @@
#include "Webserv.hpp"
void Webserv::init_virtual_servers() // ADD config param
void Webserv::init_virtual_servers(std::vector<ServerConfig>* servers)
{
_socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ?
if (_socket_fd == -1)
int ret;
std::vector<int> _open_ports;
_servers = *servers;
_listen_sockets.clear();
std::vector<ServerConfig>::iterator it = _servers.begin();
while (it != _servers.end())
{
std::perror("err socket()");
throw std::runtime_error("Socket init");
if ( std::find(_open_ports.begin(), _open_ports.end(), std::atoi(it->port.data()) ) != _open_ports.end() )
{
++it;
continue;
}
ret = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ?
if (ret == -1)
{
std::perror("err socket()");
throw std::runtime_error("Socket init");
}
_listen_sockets.push_back(ret);
_bind(_listen_sockets.back(), std::atoi(it->port.data()), it->host);
_listen(_listen_sockets.back(), 512); // 512 arbitrary
if (_epoll_update(_listen_sockets.back(), EPOLLIN, EPOLL_CTL_ADD) == -1)
throw std::runtime_error("Socket init");
_open_ports.push_back(std::atoi(it->port.data()));
++it;
}
_bind(_socket_fd, 4040);
_listen(_socket_fd, 512); // 512 arbitrary
if (_epoll_update(_socket_fd, EPOLLIN, EPOLL_CTL_ADD) == -1)
throw std::runtime_error("Socket init");
}
void Webserv::_bind(int socket_fd, in_port_t port)
void Webserv::_bind(int socket_fd, in_port_t port, std::string host)
{
// cast invalid ? how to ?
// const struct sockaddr* cast_test = static_cast<const struct sockaddr*>(addr);
@@ -26,7 +46,8 @@ void Webserv::_bind(int socket_fd, in_port_t port)
std::memset(&addr, 0, sizeof addr);
addr.sin_family = AF_INET;
addr.sin_port = ::htons(port);
addr.sin_addr.s_addr = ::htonl(INADDR_ANY); // htonl useless with 0 value (INADDR_ANY) ?
addr.sin_addr.s_addr = ::htonl(::inet_addr(host.c_str()));
// addr.sin_addr.s_addr = ::htonl(INADDR_ANY); // htonl useless with 0 value (INADDR_ANY) ?
if (::bind(socket_fd, (const sockaddr*)&addr, sizeof addr) == -1)
{