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

「🏗️」 wip: Socket creation should be working

Browse Source
This commit is contained in:
Adam JOLY
2025-04-17 13:12:46 +02:00
parent a407ee51a3
commit b98bec117b
8 changed files with 178 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
src/server.cpp
View File

@ -6,100 +6,98 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/11 16:11:40 by adjoly #+# #+# */
/* Updated: 2025/04/14 14:07:36 by adjoly ### ########.fr */
/* Updated: 2025/04/17 12:37:45 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include <cmath>
#include <log.hpp>
#include <netinet/in.h>
#include <requests/default.hpp>
#include <server/default.hpp>
#include <sstream>
#include <stdexcept>
#include <sys/socket.h>
#include <webserv.hpp>
#include <requests/default.hpp>
using namespace webserv;
std::string getMethod(std::string &data)
{
std::string getMethod(std::string &data) {
return (data.substr(0, data.substr(0, 4).find_last_not_of(" ") + 1));
}
void Server::_handle_client(int fd)
{
(void) fd;
void Server::_handle_client(int fd) {
std::string received_data;
char buffer[BUFFER_SIZE];
ssize_t bytes_received;
do
{
char buffer[BUFFER_SIZE];
ssize_t bytes_received;
do {
std::memset(buffer, 0, BUFFER_SIZE);
bytes_received = recv(fd, buffer, BUFFER_SIZE - 1, 0);
if (bytes_received == -1)
{
if (bytes_received == -1) {
_log->error("failed to receive request");
continue;
}
received_data += std::string(buffer, bytes_received);
}
while (buffer[bytes_received]);
} while (buffer[bytes_received]);
std::string response;
std::string response;
if (getMethod(received_data) == "GET")
{
if (getMethod(received_data) == "GET") {
_log->info("get request received");
http::Get request(received_data);
http::Get request(received_data);
response = request.execute().str();
}
else if (getMethod(received_data) == "DELETE")
{
} else if (getMethod(received_data) == "DELETE") {
_log->info("delete request received");
http::Delete request(received_data);
http::Delete request(received_data);
response = request.execute().str();
}
else if (getMethod(received_data) == "POST")
{
} else if (getMethod(received_data) == "POST") {
_log->info("post request received");
http::Post request(received_data);
http::Post request(received_data);
response = request.execute().str();
}
else
{
response = "HTTP/1.1 501 Not Implemented\r\nContent-Type: text/html\r\n\r\n<html><body><h1>501 Not Implemented</h1></body></html>";
} else {
response = "HTTP/1.1 501 Not Implemented\r\nContent-Type: "
"text/html\r\n\r\n<html><body><h1>501 Not "
"Implemented</h1></body></html>";
}
send(fd, response.c_str(), response.length(), 0);
send(fd, response.c_str(), response.length(), 0);
}
int Server::_fillHostsPorts(std::vector<std::string> &hosts,
std::vector<int> &ports) {
std::vector<config::Server *> *config = _conf->getServers();
for (std::vector<config::Server *>::iterator it = config->begin();
it != config->end(); it++) {
hosts.push_back((*it)->getHost());
ports.push_back((*it)->getPort());
}
return config->size();
}
void Server::_setup(void) {
_fd_server = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (_fd_server == -1)
throw std::runtime_error("error at socket setup");
std::vector<std::string> hosts;
std::vector<int> ports;
struct sockaddr_in addr;
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(_conf->getPort());
int size = _fillHostsPorts(hosts, ports);
if (size < 1)
throw std::runtime_error("no server present in the config file");
if (bind(_fd_server, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
close(_fd_server);
throw std::runtime_error("error when binding address");
}
if (listen(_fd_server, SOMAXCONN) < 0) {
close(_fd_server);
throw std::runtime_error("error when listening");
std::vector<std::string>::iterator itH = hosts.begin();
for (std::vector<int>::iterator itP = ports.begin(); itP != ports.end(); itP++, itH++) {
try {
int fd = _createSocket(*itH, *itP);
_fds_server.push_back(fd);
} catch (std::exception &e) {
throw e;
}
}
}
void Server::_run(void)
{
void Server::_run(void) {
struct pollfd fd;
fd.fd = _fd_server;
@ -109,22 +107,19 @@ void Server::_run(void)
int nbr_client = 0;
while (727)
{
while (727) {
int ret = poll(_client_fds.data(), nbr_client + 1, -1);
if (ret < 0)
{
if (ret < 0) {
close(_fd_server);
throw std::runtime_error("poll failed :(");
}
if (_client_fds[0].revents & POLLIN)
{
if (_client_fds[0].revents & POLLIN) {
struct sockaddr_in client_addr;
socklen_t addrlen = sizeof(client_addr);
int client_fd = accept(_fd_server, (struct sockaddr *)&client_addr, &addrlen);
if (client_fd < 0)
{
int client_fd =
accept(_fd_server, (struct sockaddr *)&client_addr, &addrlen);
if (client_fd < 0) {
_log->error("accept failed");
continue;
}
@ -136,16 +131,13 @@ void Server::_run(void)
// if (nbr_client) TODO do we need a max client probably not :D
}
for (int i = 1; i <= nbr_client; )
{
if (_client_fds[i].revents & POLLIN)
{
for (int i = 1; i <= nbr_client;) {
if (_client_fds[i].revents & POLLIN) {
_handle_client(_client_fds[i].fd);
close(_client_fds[i].fd);
_client_fds[i] = _client_fds[nbr_client--];
_client_fds.pop_back();
}
else
_client_fds.pop_back();
} else
++i;
}
}