francesco/cws
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add custom return codes

Browse Source
This commit is contained in:
Francesco
2025-08-02 14:09:13 +02:00
parent 2918aeadcb
commit f0abac8be7
4 changed files with 112 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/http/http.h
View File

@@ -4,12 +4,9 @@
#include <stddef.h>
#include "myclib/hashmap/myhashmap.h"
#include "myclib/string/mystring.h"
#include "utils/config.h"
#define CWS_HTTP_LOCATION_LEN 512
#define CWS_HTTP_LOCATION_PATH_LEN 1024
#define CWS_HTTP_VERSION_LEN 8
typedef enum cws_http_method_t {
CWS_HTTP_GET, /**< GET method */
CWS_HTTP_POST, /**< POST method */
@@ -29,16 +26,13 @@ typedef enum cws_http_status_t {
*
*/
typedef struct cws_http_t {
int sockfd; /**< Socket file descriptor */
cws_http_method method; /**< HTTP request method */
char location[CWS_HTTP_LOCATION_LEN]; /**< Resource requested */
char location_path[CWS_HTTP_LOCATION_PATH_LEN]; /**< Full resource path */
char http_version[CWS_HTTP_VERSION_LEN]; /**< HTTP version */
mcl_hashmap *headers; /**< Headers hash map */
int sockfd; /**< Socket file descriptor */
cws_http_method method; /**< HTTP request method */
mcl_string *location; /**< Resource requested */
mcl_string *location_path; /**< Full resource path */
mcl_string *http_version; /**< HTTP version */
mcl_hashmap *headers; /**< Headers hash map */
} cws_http;
/* Connection */
/* Accept-Encoding */
/* Accept-Language */
/**
* @brief Parses a HTTP request
@@ -48,9 +42,7 @@ typedef struct cws_http_t {
*/
cws_http *cws_http_parse(char *request_str, int sockfd, cws_config *config);
int cws_http_parse_method(cws_http *request, const char *method);
int cws_http_get_content_type(cws_http *request, char *content_type);
char *cws_http_status_string(cws_http_status status);
/**
* @brief Build the http response
@@ -66,4 +58,4 @@ void cws_http_send_simple_html(cws_http *request, cws_http_status status, char *
void cws_http_free(cws_http *request);
#endif
#endif

34
include/server/server.h
View File

@@ -22,6 +22,24 @@
/* Main server loop */
extern volatile sig_atomic_t cws_server_run;
typedef enum cws_server_ret_t {
CWS_SERVER_OK,
CWS_SERVER_FD_ERROR,
CWS_SERVER_CLIENT_NOT_FOUND,
CWS_SERVER_CLIENT_DISCONNECTED,
CWS_SERVER_CLIENT_DISCONNECTED_ERROR,
CWS_SERVER_HTTP_PARSE_ERROR,
CWS_SERVER_GETADDRINFO_ERROR,
CWS_SERVER_SOCKET_ERROR,
CWS_SERVER_SETSOCKOPT_ERROR,
CWS_SERVER_BIND_ERROR,
CWS_SERVER_LISTEN_ERROR,
CWS_SERVER_EPOLL_ADD_ERROR,
CWS_SERVER_EPOLL_DEL_ERROR,
CWS_SERVER_FD_NONBLOCKING_ERROR,
CWS_SERVER_ACCEPT_CLIENT_ERROR,
} cws_server_ret;
/**
* @brief Setups hints object
*
@@ -35,16 +53,15 @@ void cws_server_setup_hints(struct addrinfo *hints, size_t len, const char *host
* @brief Runs the server
*
* @param[in] config The server's config
* @return 0 on success, -1 on error
*/
int cws_server_start(cws_config *config);
cws_server_ret cws_server_start(cws_config *config);
/**
* @brief Main server loop
*
* @param[in,out] sockfd Socket of the commincation endpoint
*/
int cws_server_loop(int sockfd, cws_config *config);
cws_server_ret cws_server_loop(int sockfd, cws_config *config);
/**
* @brief Adds a file descriptor to the interest list
@@ -53,7 +70,7 @@ int cws_server_loop(int sockfd, cws_config *config);
* @param[in] sockfd The file descriptor to watch
* @param[in] events The events to follow
*/
int cws_epoll_add(int epfd, int sockfd, uint32_t events);
cws_server_ret cws_epoll_add(int epfd, int sockfd, uint32_t events);
/**
* @brief Removes a file descriptor from the interest list
@@ -61,14 +78,14 @@ int cws_epoll_add(int epfd, int sockfd, uint32_t events);
* @param[in] epfd epoll file descriptor
* @param[in] sockfd The file descriptor to remove
*/
int cws_epoll_del(int epfd, int sockfd);
cws_server_ret cws_epoll_del(int epfd, int sockfd);
/**
* @brief Makes a file descriptor non-blocking
*
* @param[in] sockfd The file descriptor to make non-blocking
*/
int cws_fd_set_nonblocking(int sockfd);
cws_server_ret cws_fd_set_nonblocking(int sockfd);
/**
* @brief Handles the new client
@@ -76,7 +93,6 @@ int cws_fd_set_nonblocking(int sockfd);
* @param[in] sockfd Server's file descriptor
* @param[out] their_sa Populates the struct with client's information
* @param[in] theirsa_size Size of the struct
* @return Returns -1 on error or the file descriptor on success
*/
int cws_server_accept_client(int sockfd, struct sockaddr_storage *their_sa, socklen_t *theirsa_size);
@@ -89,7 +105,7 @@ int cws_server_accept_client(int sockfd, struct sockaddr_storage *their_sa, sock
*/
void cws_server_close_client(int epfd, int client_fd, mcl_hashmap *hashmap);
int cws_server_handle_new_client(int sockfd, int epfd, mcl_hashmap *clients);
int cws_server_handle_client_data(int client_fd, int epfd, mcl_hashmap *clients, cws_config *config);
cws_server_ret cws_server_handle_new_client(int sockfd, int epfd, mcl_hashmap *clients);
cws_server_ret cws_server_handle_client_data(int client_fd, int epfd, mcl_hashmap *clients, cws_config *config);
#endif