From 2f265c40f5661c71fbde5683eb44ec34c7d9d1d8 Mon Sep 17 00:00:00 2001 From: Francesco Date: Sun, 26 Oct 2025 19:23:28 +0100 Subject: [PATCH] refactor(http): change cws_http_s to cws_request_s --- include/core/server.h | 2 +- include/http/request.h | 8 ++++---- include/http/response.h | 2 +- src/core/worker.c | 4 ++-- src/http/request.c | 18 +++++++++--------- src/http/response.c | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/core/server.h b/include/core/server.h index f9e669d..c04fecb 100644 --- a/include/core/server.h +++ b/include/core/server.h @@ -2,7 +2,7 @@ #define CWS_SERVER_H #include -#include +#include #include #include "config/config.h" diff --git a/include/http/request.h b/include/http/request.h index 066bdad..23aa73f 100644 --- a/include/http/request.h +++ b/include/http/request.h @@ -24,17 +24,17 @@ typedef enum cws_http_status { HTTP_NOT_IMPLEMENTED, } cws_http_status_e; -typedef struct cws_http { +typedef struct cws_request { int sockfd; cws_http_method_e method; string_s *location; string_s *location_path; string_s *http_version; hashmap_s *headers; -} cws_http_s; +} cws_request_s; -cws_http_s *cws_http_parse(string_s *request_str); +cws_request_s *cws_http_parse(string_s *request_str); -void cws_http_free(cws_http_s *request); +void cws_http_free(cws_request_s *request); #endif diff --git a/include/http/response.h b/include/http/response.h index 033d553..beb6775 100644 --- a/include/http/response.h +++ b/include/http/response.h @@ -9,6 +9,6 @@ size_t http_simple_html(char **response, cws_http_status_e status, char *title, size_t http_response_builder(char **response, cws_http_status_e status, char *content_type, char *body, size_t body_len_bytes); -void cws_http_send_response(cws_http_s *request, cws_http_status_e status); +void cws_http_send_response(cws_request_s *request, cws_http_status_e status); #endif diff --git a/src/core/worker.c b/src/core/worker.c index cfd24b7..ae67855 100644 --- a/src/core/worker.c +++ b/src/core/worker.c @@ -43,7 +43,7 @@ static int cws_server_handle_client_data(int epfd, int client_fd) { return CWS_SERVER_CLIENT_DISCONNECTED_ERROR; } - cws_http_s *request = cws_http_parse(data); + cws_request_s *request = cws_http_parse(data); string_free(data); if (request == NULL) { cws_server_close_client(epfd, client_fd); @@ -54,7 +54,7 @@ static int cws_server_handle_client_data(int epfd, int client_fd) { cws_http_send_response(request, HTTP_OK); cws_http_free(request); - // cws_server_close_client(epfd, client_fd); + cws_server_close_client(epfd, client_fd); return CWS_SERVER_OK; } diff --git a/src/http/request.c b/src/http/request.c index 2542d9c..c32f9be 100644 --- a/src/http/request.c +++ b/src/http/request.c @@ -8,8 +8,8 @@ #include "utils/debug.h" #include "utils/hash.h" -static cws_http_s *http_new() { - cws_http_s *request = malloc(sizeof(cws_http_s)); +static cws_request_s *http_new() { + cws_request_s *request = malloc(sizeof *request); if (!request) { return NULL; } @@ -34,7 +34,7 @@ static cws_http_method_e http_parse_method(const char *method) { return HTTP_UNKNOWN; } -static bool parse_method(cws_http_s *req, char **cursor) { +static bool parse_method(cws_request_s *req, char **cursor) { char *s = *cursor + strspn(*cursor, " "); size_t len = strcspn(s, " "); if (len == 0 || s[len] == '\0') { @@ -49,7 +49,7 @@ static bool parse_method(cws_http_s *req, char **cursor) { return true; } -static bool parse_location(cws_http_s *req, char **cursor) { +static bool parse_location(cws_request_s *req, char **cursor) { char *s = *cursor + strspn(*cursor, " "); size_t len = strcspn(s, " "); if (len == 0 || s[len] == '\0') { @@ -64,7 +64,7 @@ static bool parse_location(cws_http_s *req, char **cursor) { return true; } -static bool parse_version(cws_http_s *req, char **cursor) { +static bool parse_version(cws_request_s *req, char **cursor) { char *s = *cursor + strspn(*cursor, " \t"); size_t len = strcspn(s, "\r\n"); if (len == 0 || s[len] == '\0') { @@ -79,7 +79,7 @@ static bool parse_version(cws_http_s *req, char **cursor) { return true; } -static bool parse_headers(cws_http_s *req, char **cursor) { +static bool parse_headers(cws_request_s *req, char **cursor) { req->headers = hm_new(my_str_hash_fn, my_str_equal_fn, my_str_free_fn, my_str_free_fn, sizeof(char) * CWS_HTTP_HEADER_MAX, sizeof(char) * CWS_HTTP_HEADER_CONTENT_MAX); @@ -125,12 +125,12 @@ static bool parse_headers(cws_http_s *req, char **cursor) { return true; } -cws_http_s *cws_http_parse(string_s *request_str) { +cws_request_s *cws_http_parse(string_s *request_str) { if (!request_str || !request_str->data) { return NULL; } - cws_http_s *request = http_new(); + cws_request_s *request = http_new(); if (!request) { return NULL; } @@ -173,7 +173,7 @@ cws_http_s *cws_http_parse(string_s *request_str) { return request; } -void cws_http_free(cws_http_s *request) { +void cws_http_free(cws_request_s *request) { if (!request) { return; } diff --git a/src/http/response.c b/src/http/response.c index 73c65fb..7988a0b 100644 --- a/src/http/response.c +++ b/src/http/response.c @@ -1,6 +1,7 @@ #include "http/response.h" #include "http/mime.h" +#include "http/request.h" #include "utils/debug.h" #include #include @@ -99,8 +100,7 @@ static size_t file_data(const char *path, char **data) { return content_length; } -static void http_send_resource(cws_http_s *request) { - /* Retrieve correct Content-Type */ +static void http_send_resource(cws_request_s *request) { char content_type[CWS_HTTP_CONTENT_TYPE]; http_get_content_type(request->location_path->data, content_type); @@ -146,7 +146,7 @@ size_t http_response_builder(char **response, cws_http_status_e status, char *co return total_len; } -void cws_http_send_response(cws_http_s *request, cws_http_status_e status) { +void cws_http_send_response(cws_request_s *request, cws_http_status_e status) { char *response = NULL; switch (status) {