diff options
author | Aki <please@ignore.pl> | 2020-05-01 15:43:07 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2020-05-01 16:42:19 +0200 |
commit | 922bb99578b881065048102e03c73ff91c5ad30a (patch) | |
tree | d2033cf94f7330c194e53f91d8d4bf40d34370ca | |
parent | 03360ae6aa07289eac060870972d4ba246ca88d3 (diff) | |
download | plop-922bb99578b881065048102e03c73ff91c5ad30a.zip plop-922bb99578b881065048102e03c73ff91c5ad30a.tar.gz plop-922bb99578b881065048102e03c73ff91c5ad30a.tar.bz2 |
Moved out http-related functionality out of main file
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | http.c | 27 | ||||
-rw-r--r-- | http.h | 30 | ||||
-rw-r--r-- | plop.c | 10 |
4 files changed, 61 insertions, 8 deletions
@@ -1,6 +1,6 @@ CFLAGS+=-Wall -Wextra -Wpedantic -plop: plop.o +plop: plop.o http.o http.h clean: rm -f plop *.o @@ -0,0 +1,27 @@ +#include "http.h" + +#include <stdio.h> + +const char * status_string[] = { + [STATUS_OK] = "200 OK", + [STATUS_BAD_REQUEST] = "400 Bad Request", + [STATUS_METHOD_NOT_ALLOWED] = "405 Method Not Allowed", + [STATUS_REQUEST_TIMEOUT] = "408 Request Timeout", + [STATUS_INTERNAL_SERVER_ERROR] = "500 Internal Server Error", + [STATUS_NOT_IMPLEMENTED] = "501 Not Implemented", + [STATUS_VERSION_NOT_SUPPORTED] = "505 Version Not Supported", +}; + +/// Sends a simple response only with a status to the client. +/// \param fd File descriptor of the client socket +/// \param status HTTP response status code +/// \return Negative value if an error was encountered; numbers of bytes written otherwise +int respond_only_status(const int fd, const enum status status) +{ + static const char * pattern = + "HTTP/1.1 %s\r\n" + "Connection: close\r\n" + "\r\n"; + + return dprintf(fd, pattern, status_string[status]); +} @@ -0,0 +1,30 @@ +enum method +{ + METHOD_GET, + METHOD_HEAD, + METHOD_POST, + METHOD_PUT, + METHOD_DELETE, + METHOD_OPTIONS, + METHOD_PATCH, +}; + +struct request +{ + enum method method; +}; + +enum status +{ + STATUS_OK = 200, + STATUS_BAD_REQUEST = 400, + STATUS_METHOD_NOT_ALLOWED = 405, + STATUS_REQUEST_TIMEOUT = 408, + STATUS_INTERNAL_SERVER_ERROR = 500, + STATUS_NOT_IMPLEMENTED = 501, + STATUS_VERSION_NOT_SUPPORTED = 505, +}; + +extern const char * status_str[]; + +int respond_only_status(int, enum status); @@ -7,6 +7,8 @@ #include <sys/types.h> #include <unistd.h> +#include "http.h" + /// Tries to create, bind and start listening on INET server socket. /// \param node Hostname /// \param service Port @@ -83,13 +85,7 @@ int handle_client(struct pollfd * pfd, const int shift_by) return -1; // TODO: Handle errors properly } - static const char * response = - "HTTP/1.1 200 OK\r\n" - "Content-Type: text/plain; charset=utf-8\r\n" - "\r\n" - "plop\n"; - - if (-1 == send(pfd->fd, response, strlen(response), 0)) + if (-1 == respond_only_status(pfd->fd, STATUS_NOT_IMPLEMENTED)) { // TODO: Handle errors properly } |