diff --git a/Makefile b/Makefile index 2d13022..4c8e0c8 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,9 @@ HEADERS_D = srcs SRCS_D = srcs srcs/webserv SRCS = main.cpp \ ft_itoa.cpp \ - Webserv.cpp + base.cpp init.cpp close.cpp epoll_update.cpp signal.cpp \ + accept.cpp request.cpp response.cpp \ + run_loop.cpp OBJS_D = builds OBJS = $(SRCS:%.cpp=$(OBJS_D)/%.o) diff --git a/srcs/Webserv.hpp b/srcs/Webserv.hpp index 4a12004..6ee869b 100644 --- a/srcs/Webserv.hpp +++ b/srcs/Webserv.hpp @@ -29,16 +29,9 @@ char *ft_itoa(int n); # include // access -# define BUFSIZE 8192 -# define TIMEOUT 3000 -# define MAX_EVENTS 42 // arbitrary -# define MSG_TEST "Le Webserv / 20 =D\n" - - -// ev.data.u32 filled with tag constant "SERVER_FD/CLIENT_FD" -// dont work because ev.data is an "union", -// so we can only use one variable (fd, ptr, u32 or u64) - // ev.data.u32 = SERVER_FD; +extern bool g_run; +extern int g_last_signal; +void signal_handler(int signum); /* enum // WIP test { @@ -56,13 +49,16 @@ struct s // WIP test class Webserv { public: + // base.cpp Webserv(); // Webserv(Webserv const &src); ~Webserv(); // Webserv &operator=(Webserv const &rhs); + // init.cpp void init_virtual_servers(); // ADD config param - void start(); + // run_loop.cpp + void run(); private: int _epfd; @@ -70,27 +66,26 @@ class Webserv // std::vector _servers; std::vector _clients; + // accept.cpp void _accept_connection(int fd); - + // request.cpp void _request(Client *client); void _read_request(Client *client); - + // response.cpp void _response(Client *client); void _send_response(Client *client); void _construct_response(Client *client); void _insert_status_line(Client *client); void _get_ressource(Client *client); - - + // epoll_update.cpp int _epoll_update(int fd, uint32_t events, int op); int _epoll_update(int fd, uint32_t events, int op, void *ptr); - + // signal.cpp void _handle_last_signal(); - // void _signal_handler(int signum); // invalide dans une class - Client* _actual_client; + // close.cpp void _close_client(int fd); void _close_all_clients(); - + // init.cpp void _bind(int socket_fd, in_port_t port); void _listen(int socket_fd, unsigned int max_connections); }; diff --git a/srcs/main.cpp b/srcs/main.cpp index c577bde..aa5b1ab 100644 --- a/srcs/main.cpp +++ b/srcs/main.cpp @@ -11,7 +11,7 @@ int main(void) Webserv serv; serv.init_virtual_servers(); - serv.start(); + serv.run(); } catch (std::exception& e) { diff --git a/srcs/webserv/Webserv.cpp b/srcs/webserv/Webserv.cpp deleted file mode 100644 index 836343c..0000000 --- a/srcs/webserv/Webserv.cpp +++ /dev/null @@ -1,426 +0,0 @@ - -#include "Webserv.hpp" - -int g_last_signal; -bool g_run; -void signal_handler(int signum) -{ - g_last_signal = signum; -} - -Webserv::Webserv() -{ - std::cerr << "Server init\n"; - - _epfd = ::epoll_create1(0); // (EPOLL_CLOEXEC) for CGI fork ? - if (_epfd == -1) - { - std::perror("err epoll_create1()"); - throw std::runtime_error("Epoll init"); - } - - std::signal(SIGPIPE, signal_handler); - std::signal(SIGINT, signal_handler); -} - -/* Webserv::Webserv(Webserv const &src) -{ - -} */ - -Webserv::~Webserv() -{ - close(_socket_fd); - close(_epfd); - _close_all_clients(); - std::cerr << "Server destroyed\n"; -} - -/* Webserv & Webserv::operator=(Webserv const &rhs) -{ - -} */ - - /////////////// - // Functions // - -void Webserv::init_virtual_servers() // ADD config param -{ - _socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ? - if (_socket_fd == -1) - { - std::perror("err socket()"); - throw std::runtime_error("Socket init"); - } - - _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::start() -{ - std::cerr << "Server started\n"; - struct epoll_event events[MAX_EVENTS]; - int nfds; - int i; - int count_loop = 0; - - g_run = true; - while (g_run) - { - std::cerr << ++count_loop << "----loop epoll()\n"; - nfds = ::epoll_wait(_epfd, events, MAX_EVENTS, TIMEOUT); - if (nfds == -1) - { - std::perror("err epoll_wait()"); - throw std::runtime_error("Epoll wait"); - } - else if (nfds == 0) - { - if (!_clients.empty()) - { - std::cerr << "Timeout " << TIMEOUT << "ms\n"; - _close_all_clients(); - } - } - i = 0; - while (i < nfds) - { - // if ((events[i].data.u32 == SERVER_FD) && (events[i].events & EPOLLIN)) // Dont work, see "SERVER_FD" define - if ((events[i].data.fd == _socket_fd) && (events[i].events & EPOLLIN)) - _accept_connection(events[i].data.fd); - else if (events[i].events & EPOLLIN) - _request(static_cast(events[i].data.ptr)); - else if (events[i].events & EPOLLOUT) - _response(static_cast(events[i].data.ptr)); // NEED TO BREAK HERE IF SIGINT (or throw in _handle_signal ?) - ++i; - _actual_client = NULL; - } - } - -} - - - /////////////////////// - // Private Functions // - -void Webserv::_accept_connection(int fd) -{ - struct sockaddr_in addr; - socklen_t addr_len; - int accepted_fd; - - std::cerr << "accept()\n"; - addr_len = sizeof addr; - accepted_fd = ::accept(fd, (sockaddr*)&addr, &addr_len); - if (accepted_fd == -1) - { - std::perror("err accept()"); - return ; - } - ::fcntl(accepted_fd, F_SETFL, O_NONBLOCK); - - _clients.push_back(Client()); - _clients.back().fd = accepted_fd; - - _epoll_update(accepted_fd, EPOLLIN, EPOLL_CTL_ADD, &_clients.back()); -} - - ////////// - // READ // - -void Webserv::_request(Client *client) -{ - _read_request(client); -} - -void Webserv::_read_request(Client *client) -{ - char buf[BUFSIZE+1]; - ssize_t ret; - _actual_client = client; - - std::cerr << "recv()\n"; - ret = ::recv(client->fd, buf, BUFSIZE, 0); - if (ret == -1) - { - std::perror("err recv()"); - // if (g_last_signal) - // _handle_last_signal(); - // else - // _close_client(client->fd); - - std::cerr << "client ptr =" << client << "\n"; // DEBUG - std::cerr << "client.fd =" << client->fd << "\n"; // DEBUG - return ; - } - /* - if (ret == BUFSIZE) - // send error like "request too long" to client - */ - - buf[ret] = '\0'; - client->raw_request.append(buf); - - _epoll_update(client->fd, EPOLLOUT, EPOLL_CTL_MOD, client); -} - - /////////// - // WRITE // - -void Webserv::_response(Client *client) -{ - _send_response(client); - client->raw_request.clear(); - client->response.clear(); -} - -void Webserv::_send_response(Client *client) -{ - ssize_t ret; - _actual_client = client; - - std::cerr << "send()\n"; - std::cerr << "RAW_REQUEST\n|\n" << client->raw_request << "|\n"; // DEBUG - - _construct_response(client); - - ret = ::send(client->fd, client->response.data(), client->response.size(), 0); - if (ret == -1) - { - std::perror("err send()"); - if (g_last_signal) - _handle_last_signal(); - // else - // _close_client(client->fd); - return ; - } - - _close_client(client->fd); - // if (client->raw_request.find("Connection: keep-alive") == std::string::npos) - // _close_client(client->fd); - // else - // _epoll_update(client->fd, EPOLLIN, EPOLL_CTL_MOD, client); -} - -void Webserv::_construct_response(Client *client) -{ - client->status = 200; - client->response.append("Server: Webserv/0.1\r\n"); - - client->response.append("Connection: close\r\n"); - - _get_ressource(client); - - _insert_status_line(client); -} - -#define E404 "\r\n404 Not Found

404 Not Found


Le Webserv/0.1

" -#define E500 "\r\n500 Internal Server Error

500 Internal Server Error


Le Webserv/0.1

" -void Webserv::_insert_status_line(Client *client) -{ - std::string status_line; - - status_line.append("HTTP/1.1 "); - // WIP, maybe make a map for status response - switch (client->status) - { - case (200): - status_line.append("200 OK"); - break; - case (404): - status_line.append("404 Not Found"); - client->response.append(E404); - break; - case (500): - status_line.append("500 Internal Server Error"); - client->response.append(E500); - break; - } - status_line.append("\r\n"); - - client->response.insert(0, status_line); -} - -#define ROOT "website" -#define INDEX "index.html" -#define FILENAME "rfc2119_no_link.html" -#define MAX_FILESIZE 1000000 // (1Mo) -void Webserv::_get_ressource(Client *client) -{ - std::ifstream ifd; // For chunk, ifstream directly in struct CLient for multiples read without close() ? - char buf[MAX_FILESIZE+1]; - char *tmp; - - // Mini parsing à l'arrache du PATH - std::string path; - path = client->raw_request.substr(0, client->raw_request.find("\r\n")); - path = path.substr(0, path.rfind(" ")); - path = path.substr(path.find("/")); - if (path == "/") - path.append(INDEX); - path.insert(0, ROOT); - - if (access(path.data(), R_OK) == -1) - { - std::perror("err access()"); - client->status = 404; - return ; - } - - ifd.open(path.data(), std::ios::binary | std::ios::ate); // std::ios::binary (binary for files like images ?) - if (!ifd) - { - std::cerr << path << ": open fail" << '\n'; - client->status = 500; - } - else - { - // WIP : Chunk or not chunk (if filesize too big) - std::streampos size = ifd.tellg(); - if (size > MAX_FILESIZE) - { - // Then chunk - client->status = 500; // WIP temp - std::cerr << "File too large for non chunk body\n"; - ifd.close(); - return ; - } - - ifd.seekg(0, std::ios::beg); - ifd.read(buf, size); - buf[ifd.gcount()] = '\0'; - - client->response.append("Content-Type: text/html; charset=UTF-8\r\n"); - - client->response.append("Content-Length: "); - tmp = ::ft_itoa(ifd.gcount()); - client->response.append(tmp); - delete tmp; - client->response.append("\r\n"); - - // Body - client->response.append("\r\n"); - client->response.append(buf); - - - ifd.close(); - } -} - - - //////////////////// - // Misc functions // - -int Webserv::_epoll_update(int fd, uint32_t events, int op) -{ - struct epoll_event ev; - std::memset(&ev, 0, sizeof ev); - ev.events = events; - ev.data.fd = fd; - if (::epoll_ctl(_epfd, op, fd, &ev) == -1) - { - std::perror("err _epoll_update()"); - return (-1); - } - return (0); -} - -int Webserv::_epoll_update(int fd, uint32_t events, int op, void *ptr) -{ - struct epoll_event ev; - std::memset(&ev, 0, sizeof ev); - ev.events = events; - ev.data.ptr = ptr; - if (::epoll_ctl(_epfd, op, fd, &ev) == -1) - { - std::perror("err _epoll_update()"); - return (-1); - } - return (0); -} - -void Webserv::_handle_last_signal() -{ - if (g_last_signal == SIGPIPE) - { - std::cerr << "SIGPIPE\n"; - if (_actual_client) - { - _close_client(_actual_client->fd); - _actual_client = NULL; - } - } - else if (g_last_signal == SIGINT) - { - g_run = false; - // maybe a throw here instead of "g_run" ? - } - g_last_signal = 0; -} - -void Webserv::_close_client(int fd) -{ - std::vector::iterator it = _clients.begin(); - while (it != _clients.end()) - { - if (it->fd == fd) - { - // _epoll_update(fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG - if (::close(fd) == -1) - std::perror("err close()"); - else - std::cerr << "close fd " << fd << "\n"; - _clients.erase(it); - break; - } - ++it; - } -} - -void Webserv::_close_all_clients() -{ - while (!_clients.empty()) - { - // _epoll_update(_clients.back().fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG - if (::close(_clients.back().fd) == -1) - std::perror("err close()"); - else - std::cerr << "close fd " << _clients.back().fd << "\n"; - _clients.pop_back(); - } -} - - - //////////////////// - // Init functions // - -void Webserv::_bind(int socket_fd, in_port_t port) -{ - // cast invalid ? how to ? - // const struct sockaddr* cast_test = static_cast(addr); - - struct sockaddr_in addr; - 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) ? - - if (::bind(socket_fd, (const sockaddr*)&addr, sizeof addr) == -1) - { - std::perror("err bind()"); - throw std::runtime_error("Socket bind"); - } -} - -void Webserv::_listen(int socket_fd, unsigned int max_connections) -{ - if (::listen(socket_fd, max_connections) == -1) - { - std::perror("err listen()"); - throw std::runtime_error("Socket listen"); - } -} diff --git a/srcs/webserv/accept.cpp b/srcs/webserv/accept.cpp new file mode 100644 index 0000000..cd67904 --- /dev/null +++ b/srcs/webserv/accept.cpp @@ -0,0 +1,26 @@ + +#include "Webserv.hpp" + +void Webserv::_accept_connection(int fd) +{ + struct sockaddr_in addr; + socklen_t addr_len; + int accepted_fd; + + std::cerr << "accept()\n"; + addr_len = sizeof addr; + accepted_fd = ::accept(fd, (sockaddr*)&addr, &addr_len); + if (accepted_fd == -1) + { + std::perror("err accept()"); + if (g_last_signal) + _handle_last_signal(); + return ; + } + ::fcntl(accepted_fd, F_SETFL, O_NONBLOCK); + + _clients.push_back(Client()); + _clients.back().fd = accepted_fd; + + _epoll_update(accepted_fd, EPOLLIN, EPOLL_CTL_ADD, &_clients.back()); +} diff --git a/srcs/webserv/base.cpp b/srcs/webserv/base.cpp new file mode 100644 index 0000000..57b2072 --- /dev/null +++ b/srcs/webserv/base.cpp @@ -0,0 +1,35 @@ + +#include "Webserv.hpp" + +Webserv::Webserv() +{ + std::cerr << "Server init\n"; + + _epfd = ::epoll_create1(0); // (EPOLL_CLOEXEC) for CGI fork ? + if (_epfd == -1) + { + std::perror("err epoll_create1()"); + throw std::runtime_error("Epoll init"); + } + + std::signal(SIGPIPE, signal_handler); + std::signal(SIGINT, signal_handler); +} + +/* Webserv::Webserv(Webserv const &src) +{ + +} */ + +Webserv::~Webserv() +{ + close(_socket_fd); + close(_epfd); + _close_all_clients(); + std::cerr << "Server destroyed\n"; +} + +/* Webserv & Webserv::operator=(Webserv const &rhs) +{ + +} */ diff --git a/srcs/webserv/close.cpp b/srcs/webserv/close.cpp new file mode 100644 index 0000000..f4bc0b9 --- /dev/null +++ b/srcs/webserv/close.cpp @@ -0,0 +1,34 @@ + +#include "Webserv.hpp" + +void Webserv::_close_client(int fd) +{ + std::vector::iterator it = _clients.begin(); + while (it != _clients.end()) + { + if (it->fd == fd) + { + // _epoll_update(fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG + if (::close(fd) == -1) + std::perror("err close()"); + else + std::cerr << "close fd " << fd << "\n"; + _clients.erase(it); + break; + } + ++it; + } +} + +void Webserv::_close_all_clients() +{ + while (!_clients.empty()) + { + // _epoll_update(_clients.back().fd, 0, EPOLL_CTL_DEL); // normalement superflu, DEBUG + if (::close(_clients.back().fd) == -1) + std::perror("err close()"); + else + std::cerr << "close fd " << _clients.back().fd << "\n"; + _clients.pop_back(); + } +} diff --git a/srcs/webserv/epoll_update.cpp b/srcs/webserv/epoll_update.cpp new file mode 100644 index 0000000..bfe0770 --- /dev/null +++ b/srcs/webserv/epoll_update.cpp @@ -0,0 +1,30 @@ + +#include "Webserv.hpp" + +int Webserv::_epoll_update(int fd, uint32_t events, int op) +{ + struct epoll_event ev; + std::memset(&ev, 0, sizeof ev); + ev.events = events; + ev.data.fd = fd; + if (::epoll_ctl(_epfd, op, fd, &ev) == -1) + { + std::perror("err _epoll_update()"); + return (-1); + } + return (0); +} + +int Webserv::_epoll_update(int fd, uint32_t events, int op, void *ptr) +{ + struct epoll_event ev; + std::memset(&ev, 0, sizeof ev); + ev.events = events; + ev.data.ptr = ptr; + if (::epoll_ctl(_epfd, op, fd, &ev) == -1) + { + std::perror("err _epoll_update()"); + return (-1); + } + return (0); +} diff --git a/srcs/webserv/init.cpp b/srcs/webserv/init.cpp new file mode 100644 index 0000000..97a3b90 --- /dev/null +++ b/srcs/webserv/init.cpp @@ -0,0 +1,45 @@ + +#include "Webserv.hpp" + +void Webserv::init_virtual_servers() // ADD config param +{ + _socket_fd = ::socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0); // (SOCK_CLOEXEC) for CGI fork ? + if (_socket_fd == -1) + { + std::perror("err socket()"); + throw std::runtime_error("Socket init"); + } + + _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) +{ + // cast invalid ? how to ? + // const struct sockaddr* cast_test = static_cast(addr); + + struct sockaddr_in addr; + 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) ? + + if (::bind(socket_fd, (const sockaddr*)&addr, sizeof addr) == -1) + { + std::perror("err bind()"); + throw std::runtime_error("Socket bind"); + } +} + +void Webserv::_listen(int socket_fd, unsigned int max_connections) +{ + if (::listen(socket_fd, max_connections) == -1) + { + std::perror("err listen()"); + throw std::runtime_error("Socket listen"); + } +} diff --git a/srcs/webserv/request.cpp b/srcs/webserv/request.cpp new file mode 100644 index 0000000..17c372b --- /dev/null +++ b/srcs/webserv/request.cpp @@ -0,0 +1,37 @@ + +#include "Webserv.hpp" + +#define BUFSIZE 8192 + +void Webserv::_request(Client *client) +{ + _read_request(client); + if (g_last_signal) + _handle_last_signal(); +} + +void Webserv::_read_request(Client *client) +{ + char buf[BUFSIZE+1]; + ssize_t ret; + + std::cerr << "recv()\n"; + ret = ::recv(client->fd, buf, BUFSIZE, 0); + if (ret == -1) + { + std::perror("err recv()"); + std::cerr << "client ptr =" << client << "\n"; // DEBUG + std::cerr << "client.fd =" << client->fd << "\n"; // DEBUG + _close_client(client->fd); + return ; + } + /* + if (ret == BUFSIZE) + // send error like "request too long" to client + */ + + buf[ret] = '\0'; + client->raw_request.append(buf); + + _epoll_update(client->fd, EPOLLOUT, EPOLL_CTL_MOD, client); +} diff --git a/srcs/webserv/response.cpp b/srcs/webserv/response.cpp new file mode 100644 index 0000000..ce785ed --- /dev/null +++ b/srcs/webserv/response.cpp @@ -0,0 +1,143 @@ + +#include "Webserv.hpp" + +void Webserv::_response(Client *client) +{ + _send_response(client); + if (g_last_signal) + _handle_last_signal(); +} + +void Webserv::_send_response(Client *client) +{ + ssize_t ret; + + std::cerr << "send()\n"; + std::cerr << "RAW_REQUEST\n|\n" << client->raw_request << "|\n"; // DEBUG + + _construct_response(client); + + ret = ::send(client->fd, client->response.data(), client->response.size(), 0); + if (ret == -1) + { + std::perror("err send()"); + std::cerr << "client ptr =" << client << "\n"; // DEBUG + std::cerr << "client.fd =" << client->fd << "\n"; // DEBUG + _close_client(client->fd); + return ; + } + + _close_client(client->fd); + /* if (client->raw_request.find("Connection: keep-alive") == std::string::npos) + _close_client(client->fd); + else + { + _epoll_update(client->fd, EPOLLIN, EPOLL_CTL_MOD, client); + client->raw_request.clear(); + client->response.clear(); + } */ +} + +void Webserv::_construct_response(Client *client) +{ + client->status = 200; + client->response.append("Server: Webserv/0.1\r\n"); + + client->response.append("Connection: close\r\n"); + + _get_ressource(client); + + _insert_status_line(client); +} + +#define E404 "\r\n404 Not Found

404 Not Found


Le Webserv/0.1

" +#define E500 "\r\n500 Internal Server Error

500 Internal Server Error


Le Webserv/0.1

" +void Webserv::_insert_status_line(Client *client) +{ + std::string status_line; + + status_line.append("HTTP/1.1 "); + // WIP, maybe make a map for status response + switch (client->status) + { + case (200): + status_line.append("200 OK"); + break; + case (404): + status_line.append("404 Not Found"); + client->response.append(E404); + break; + case (500): + status_line.append("500 Internal Server Error"); + client->response.append(E500); + break; + } + status_line.append("\r\n"); + + client->response.insert(0, status_line); +} + +#define ROOT "website" +#define INDEX "index.html" +#define MAX_FILESIZE 1000000 // (1Mo) +void Webserv::_get_ressource(Client *client) +{ + std::ifstream ifd; // For chunk, ifstream directly in struct CLient for multiples read without close() ? + char buf[MAX_FILESIZE+1]; + char *tmp; + + // Mini parsing à l'arrache du PATH + std::string path; + path = client->raw_request.substr(0, client->raw_request.find("\r\n")); + path = path.substr(0, path.rfind(" ")); + path = path.substr(path.find("/")); + if (path == "/") + path.append(INDEX); + path.insert(0, ROOT); + + if (access(path.data(), R_OK) == -1) + { + std::perror("err access()"); + client->status = 404; + return ; + } + + ifd.open(path.data(), std::ios::binary | std::ios::ate); // std::ios::binary (binary for files like images ?) + if (!ifd) + { + std::cerr << path << ": open fail" << '\n'; + client->status = 500; + } + else + { + // WIP : Chunk or not chunk (if filesize too big) + std::streampos size = ifd.tellg(); + if (size > MAX_FILESIZE) + { + // Then chunk + client->status = 500; // WIP temp + std::cerr << "File too large for non chunk body\n"; + ifd.close(); + return ; + } + + ifd.seekg(0, std::ios::beg); + ifd.read(buf, size); + buf[ifd.gcount()] = '\0'; + + client->response.append("Content-Type: text/html; charset=UTF-8\r\n"); + + client->response.append("Content-Length: "); + tmp = ::ft_itoa(ifd.gcount()); + client->response.append(tmp); + delete tmp; + client->response.append("\r\n"); + + // Body + client->response.append("\r\n"); + client->response.append(buf); + + + ifd.close(); + } +} diff --git a/srcs/webserv/run_loop.cpp b/srcs/webserv/run_loop.cpp new file mode 100644 index 0000000..9b466b5 --- /dev/null +++ b/srcs/webserv/run_loop.cpp @@ -0,0 +1,48 @@ + +#include "Webserv.hpp" + +#define MAX_EVENTS 42 // arbitrary +#define TIMEOUT 3000 + +void Webserv::run() +{ + std::cerr << "Server started\n"; + struct epoll_event events[MAX_EVENTS]; + int nfds; + int i; + int count_loop = 0; + + g_run = true; + while (g_run) + { + std::cerr << ++count_loop << "----loop epoll()\n"; + nfds = ::epoll_wait(_epfd, events, MAX_EVENTS, TIMEOUT); + if (nfds == -1) + { + std::perror("err epoll_wait()"); + throw std::runtime_error("Epoll wait"); + } + else if (nfds == 0) + { + if (!_clients.empty()) + { + std::cerr << "Timeout " << TIMEOUT << "ms\n"; + _close_all_clients(); + } + } + i = 0; + while (i < nfds) + { + // if ((events[i].data.u32 == SERVER_FD) && (events[i].events & EPOLLIN)) // Dont work, see "SERVER_FD" define + if ((events[i].data.fd == _socket_fd) && (events[i].events & EPOLLIN)) + _accept_connection(events[i].data.fd); + else if (events[i].events & EPOLLIN) + _request(static_cast(events[i].data.ptr)); + else if (events[i].events & EPOLLOUT) + _response(static_cast(events[i].data.ptr)); + ++i; + if (!g_run) + break; + } + } +} diff --git a/srcs/webserv/signal.cpp b/srcs/webserv/signal.cpp new file mode 100644 index 0000000..1074f26 --- /dev/null +++ b/srcs/webserv/signal.cpp @@ -0,0 +1,29 @@ + +#include "Webserv.hpp" + +bool g_run; +int g_last_signal; + +void signal_handler(int signum) +{ + g_last_signal = signum; +} + +void Webserv::_handle_last_signal() +{ + if (g_last_signal == SIGPIPE) + { + std::cerr << "SIGPIPE\n"; + // if (_actual_client) + // { + // _close_client(_actual_client->fd); + // _actual_client = NULL; + // } + } + else if (g_last_signal == SIGINT) + { + g_run = false; + // maybe a throw here instead of "g_run" ? + } + g_last_signal = 0; +} diff --git a/website/index.html b/website/index.html index 21ae979..bc65643 100644 --- a/website/index.html +++ b/website/index.html @@ -1,7 +1,7 @@ - 404 Not Found + Le Webserv

Le index (˘ ͜ʖ˘)