From a22a266b20108383e69968165c27f521ed28e93c Mon Sep 17 00:00:00 2001 From: Francesco Date: Sun, 26 Oct 2025 19:24:00 +0100 Subject: [PATCH] refactor(server): remove myclib/socket include --- src/core/server.c | 23 +++++++++++------------ src/http/mime.c | 1 + 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/core/server.c b/src/core/server.c index 4d82c88..b0a6554 100644 --- a/src/core/server.c +++ b/src/core/server.c @@ -10,6 +10,7 @@ #include "utils/debug.h" #include "utils/error.h" #include "utils/net.h" +#include static void cws_server_setup_hints(struct addrinfo *hints, const char *hostname) { memset(hints, 0, sizeof *hints); @@ -125,17 +126,15 @@ cws_server_ret cws_server_start(cws_server_s *server) { } for (int i = 0; i < nfds; ++i) { - if (events[i].data.fd == server->sockfd) { - client_fd = cws_server_handle_new_client(server->sockfd); - if (client_fd < 0) { - continue; - } - - /* Add client to a worker */ - cws_fd_set_nonblocking(client_fd); - cws_epoll_add(server->workers[workers_index]->epfd, client_fd); - workers_index = (workers_index + 1) % CWS_WORKERS_NUM; + client_fd = cws_server_handle_new_client(server->sockfd); + if (client_fd < 0) { + continue; } + + /* Add client to a worker */ + cws_fd_set_nonblocking(client_fd); + cws_epoll_add(server->workers[workers_index]->epfd, client_fd); + workers_index = (workers_index + 1) % CWS_WORKERS_NUM; } } @@ -176,11 +175,11 @@ void cws_server_shutdown(cws_server_s *server) { } if (server->sockfd > 0) { - sock_close(server->sockfd); + close(server->sockfd); } if (server->epfd > 0) { - sock_close(server->epfd); + close(server->epfd); } if (server->workers) { diff --git a/src/http/mime.c b/src/http/mime.c index 4a41769..6daa90e 100644 --- a/src/http/mime.c +++ b/src/http/mime.c @@ -20,6 +20,7 @@ int http_get_content_type(char *location_path, char *content_type) { for (size_t i = 0; i < ARR_SIZE(mimetypes); ++i) { if (!strcmp(ptr, mimetypes[i].ext)) { snprintf(content_type, CWS_HTTP_CONTENT_TYPE - 1, "%s", mimetypes[i].type); + return 0; } }