add more content types and improve code

This commit is contained in:
2024-11-27 18:55:15 +01:00
parent 4e8e6ec9a7
commit 3da61ef47c
9 changed files with 413 additions and 318 deletions

View File

@@ -19,6 +19,7 @@ enum http_method {
*
*/
typedef struct http {
int sockfd; /**< Socket file descriptor */
enum http_method method; /**< HTTP request method */
char location[LOCATION_LEN]; /**< Resource requested */
char location_path[LOCATION_LEN]; /**< Resource path */
@@ -33,14 +34,18 @@ typedef struct http {
/**
* @brief Parses a HTTP request
*
* @param request[in] The http request sent to the server
* @param request_str[in] The http request sent to the server
* @return Returns a http_t pointer to the request
*/
http_t *http_parse(char *request_str);
http_t *http_parse(char *request_str, int sockfd);
void http_parse_method(http_t *request, const char *method);
void http_send_response(http_t *request, int sockfd);
void http_get_content_type(http_t *request, char *content_type);
void http_send_response(http_t *request);
void http_send_not_found(http_t *request);
void http_send_not_implemented(http_t *request);
void http_free(http_t *request);
#endif

View File

@@ -1,18 +1,8 @@
#ifndef CWS_SERVER_H
#define CWS_SERVER_H
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
#include "utils/hashmap.h"
@@ -68,9 +58,9 @@ void epoll_ctl_add(int epfd, int sockfd, uint32_t events);
void epoll_ctl_del(int epfd, int sockfd);
/**
* @brief Makes a file descriptor non blocking
* @brief Makes a file descriptor non-blocking
*
* @param sockfd[in] The file descriptor to make non blocking
* @param sockfd[in] The file descriptor to make non-blocking
*/
void setnonblocking(int sockfd);
@@ -87,8 +77,17 @@ int handle_new_client(int sockfd, struct sockaddr_storage *their_sa, socklen_t *
/**
* @brief Closes all the file descriptors opened
*
* @param map[in] The hash map
* @param bucket[in] The hash map
*/
void close_fds(bucket_t *bucket);
/**
* @brief Disconnect a client
*
* @param epfd[in] Epoll file descriptor
* @param client_fd[in] Client file descriptor
* @param bucket[in] Clients hash map
*/
void close_client(int epfd, int client_fd, bucket_t *bucket);
#endif