42_adjoly/webserv
1
0
Fork 0
mirror of https://github.com/KeyZox71/webserv.git synced 2025-05-11 00:08:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

「🏗️」 wip: wtf

Browse Source
This commit is contained in:
Adam JOLY
2025-04-30 15:59:03 +02:00
parent b955d04331
commit ea3bf0c4a3
3 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/config/Route.hpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/03/19 14:59:41 by adjoly #+# #+# */ /* Created: 2025/03/19 14:59:41 by adjoly #+# #+# */
/* Updated: 2025/04/22 12:34:00 by adjoly ### ########.fr */ /* Updated: 2025/04/30 15:45:59 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

71
src/server/Server.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/11 16:11:40 by adjoly #+# #+# */ /* Created: 2025/04/11 16:11:40 by adjoly #+# #+# */
/* Updated: 2025/04/29 17:28:17 by adjoly ### ########.fr */ /* Updated: 2025/04/30 15:41:46 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -107,9 +107,10 @@ void Server::_run(void) {
// to add signal instead of 727 // to add signal instead of 727
while (727 - sigHandling()) { while (727 - sigHandling()) {
if (poll(_client_fds.data(), _client_fds.size(), -1) < 0) { if (poll(_client_fds.data(), _client_fds.size(), 5000) < 0) {
if (errno == EINTR) if (errno == EINTR) {
continue; continue;
}
std::stringstream str; std::stringstream str;
str << "poll failed : "; str << "poll failed : ";
str << strerror(errno); str << strerror(errno);
@ -117,45 +118,53 @@ void Server::_run(void) {
continue; continue;
} }
for (auto it = range(_fds_server)) { size_t i = 0;
struct sockaddr_in client_addr; for (auto it = range(_fds_server), i++) {
socklen_t addrlen = sizeof(client_addr); if (_client_fds[i].revents & POLLIN) {
int client_fd = _log->info("polliiiiiiiiiiiiiiiinnnnnnnnnnnnnnnn");
accept((*it), (struct sockaddr *)&client_addr, &addrlen); struct sockaddr_in client_addr;
socklen_t addrlen = sizeof(client_addr);
int client_fd =
accept((*it), (struct sockaddr *)&client_addr, &addrlen);
if (client_fd < 0) { if (client_fd < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK) if (errno == EAGAIN || errno == EWOULDBLOCK) {
continue;
}
std::stringstream str;
str << "Accept failed: ";
str << strerror(errno);
_log->error(str.str());
continue; continue;
std::stringstream str; }
str << "Accept failed: ";
str << strerror(errno);
_log->error(str.str());
continue;
}
struct pollfd pfd; _log->info("connection accepted");
pfd.fd = client_fd;
pfd.events = POLLIN | POLLOUT; struct pollfd pfd;
pfd.revents = 0; pfd.fd = client_fd;
_client_fds.push_back(pfd); pfd.events = POLLIN | POLLOUT;
struct pollfd *ppfd = _client_fds.data() + _client_fds.size() - 1; pfd.revents = 0;
Client *new_client = new Client(ppfd, client_addr, _conf); _client_fds.push_back(pfd);
if (new_client == NULL) { struct pollfd *ppfd =
continue; _client_fds.data() + _client_fds.size() - 1;
Client *new_client = new Client(ppfd, client_addr, _conf);
if (new_client == NULL) {
continue;
}
_client_data.push_back(new_client);
_log->debug("client pushed");
} }
_client_data.push_back(new_client);
std::cout << "client pushed" << std::endl;
} }
for (size_t i = _fds_server.size(); i < _client_fds.size(); ++i) { for (size_t i = _fds_server.size(); i < _client_fds.size(); ++i) {
if (_client_fds[i].revents & POLLERR) { if (_client_fds[i].revents & POLLERR) {
_log->info("pollerr"); _log->debug("pollerr");
close(_client_fds[i].fd); close(_client_fds[i].fd);
_client_fds.erase(_client_fds.begin() + i); _client_fds.erase(_client_fds.begin() + i);
delete _client_data[i - _fds_server.size()]; delete _client_data[i - _fds_server.size()];
_client_data.erase(_client_data.begin() + i); _client_data.erase(_client_data.begin() + i);
} else if (_client_fds[i].revents & POLLIN) { } else if (_client_fds[i].revents & POLLIN) {
_log->info("pollin"); _log->debug("pollin");
Client *client = _getClient(_client_fds[i].fd); Client *client = _getClient(_client_fds[i].fd);
if (client == not_nullptr) { if (client == not_nullptr) {
_log->error("client does not exist"); _log->error("client does not exist");
@ -165,7 +174,7 @@ void Server::_run(void) {
} else if (_client_fds[i].revents & POLLOUT) { } else if (_client_fds[i].revents & POLLOUT) {
std::stringstream str; std::stringstream str;
str << _client_fds[i].fd; str << _client_fds[i].fd;
_log->info("pollout = " + str.str()); _log->debug("pollout = " + str.str());
Client *client = _getClient(_client_fds[i].fd); Client *client = _getClient(_client_fds[i].fd);
if (client == not_nullptr) { if (client == not_nullptr) {
@ -180,7 +189,7 @@ void Server::_run(void) {
delete client; delete client;
for (auto it = range(_client_fds)) { for (auto it = range(_client_fds)) {
if (_client_fds[i].fd == (*it).fd) { if (_client_fds[i].fd == (*it).fd) {
std::cout << "client fds erased" << std::endl; _log->debug("client fds erased");
close(it.base()->fd); close(it.base()->fd);
_client_fds.erase(it); _client_fds.erase(it);
break; break;

2
src/server/ServerUtils.cpp
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/17 11:58:42 by adjoly #+# #+# */ /* Created: 2025/04/17 11:58:42 by adjoly #+# #+# */
/* Updated: 2025/04/28 14:30:27 by adjoly ### ########.fr */ /* Updated: 2025/04/30 15:25:15 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */