First working version

TODO: needs refactoring

1 files changed, 15 insertions, 55 deletions

diff --git a/main.c b/main.c
index 3a0c5ca..8f1d3ef 100644
--- a/main.c
+++ b/main.c
@@ -35,20 +35,7 @@
 * }}}
 */
 
-// {{{ INCLUDES
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <err.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <sys/sendfile.h>
-#include <sys/stat.h>
-// #include <pthread.h>      // maybe later
-// }}}
+#include "main.h"
 // {{{ MACROS
 #define EWOULDBLOCK_DELAY     100
 #define READ_BUFFER_LENGTH    9000 // jumboframe?
@@ -67,36 +54,7 @@ static inline int verbose(const char * format, ...) {
 #endif
 // }}}
 
-typedef struct {
-        int    newline_length; // lenght of one newline in bytes (\n has 1, CR/LF has 2)
-        char * method;         // GET/POST or something like that
-        char * url;            // request URL (e.g. /index.html)
-        char * boundary;       // usually looks similar to ------1234
-        size_t boundary_size;  // size in bytes, calculated after first header complete; is an indicator for the first header
-        char * content_type;   // sometimes 'text/html', also sometimes 'text/html; boundary=------1234'
-        char * content_disposition; // includes file names of uploaded files or field names with form-data (e.g. curl -F)
-} Http_Header;
-
-void send_answer(int fd_socket, Http_Header * http_header) {
-        FILE * f = fdopen((size_t) fd_socket, "w");
-        fputs("HTTP/1.0 200 OK\n", f);
-        fputs("content-type: text/plain\n\n", f);
-        fflush(f);
-
-        int file = open(&http_header->url[1], O_RDONLY);
-        if(0 < file) {
-                struct stat stat;
-                fstat(file, &stat);
-                sendfile (fileno(f), file, NULL, stat.st_size);
-        } else {
-                if(http_header->url) // TODO: too dangerous to check that here, that is too late.
-                        fprintf(f, "could not open file \"%s\"\n", &http_header->url[1]);
-        }
-
-        fclose(f);
-}
-
-int read_everything(FILE * f_r, FILE * output) {
+static int read_everything(FILE * f_r, FILE * output) {
         const int read_buffer_length = READ_BUFFER_LENGTH;
         char read_buffer[read_buffer_length];
         for(size_t size = -2 ; ; size = fread(read_buffer, 1, read_buffer_length, f_r)) {
@@ -118,7 +76,7 @@ int read_everything(FILE * f_r, FILE * output) {
         return EXIT_SUCCESS;
 }
 
-void * next_customer(size_t new_socket) {
+static void * next_customer(size_t new_socket) {
         FILE * f_r = fdopen((size_t) new_socket, "r");
 
         char * output_buffer = NULL;
@@ -229,12 +187,16 @@ void * next_customer(size_t new_socket) {
                                                         end += strspn(end, "-");
                                                         if(0 == strncmp(end, http_header.boundary, http_header.boundary_size)) {
                                                                 size_t file_size = content_end - content_start;
-                                                                DEBUG("> Content ends here, size of the last file is %ld.", file_size);
+                                                                DEBUG("> Content ends here, size of the last file is %ld\n", file_size);
+
+                                                                content_start[file_size + 1] = '\0';
+                                                                next_part(&http_header, content_start, file_size);
 
                                                                 end += http_header.boundary_size;
                                                                 matchlen = strspn(end, "\r\n");
                                                                 DEBUG("> end is at %p, matchlen is %ld\n", end, matchlen);
 
+
                                                                 search = ":";
                                                                 break;
                                                         } else {
@@ -252,9 +214,9 @@ void * next_customer(size_t new_socket) {
                         start = end + matchlen;
         }
 
-        DEBUG("> sending answer...");
-        send_answer(new_socket, &http_header);
-        DEBUG("> answer sent.");
+        DEBUG("> sending answer...\n");
+        send_answer(&http_header, new_socket);
+        DEBUG("> answer sent.\n");
 
         fclose(f_r);
 
@@ -264,7 +226,7 @@ void * next_customer(size_t new_socket) {
         return NULL;
 }
 
-int serve(int server_fd)
+static int serve(int server_fd)
 {
         struct sockaddr_in address;
         socklen_t address_len = sizeof(address);
@@ -276,10 +238,8 @@ int serve(int server_fd)
                 DEBUG("> Client %ld is connected via port %d\n", new_socket, address.sin_port);
 
                 // set non blocking mode...
-                fcntl(
-                        (size_t) new_socket,
-                        F_SETFL,
-                        fcntl((size_t) new_socket, F_GETFL) | O_NONBLOCK
+                fcntl(new_socket, F_SETFL,
+                        fcntl(new_socket, F_GETFL) | O_NONBLOCK
                 );
 
                 next_customer(new_socket);
@@ -321,4 +281,4 @@ int main(const int argc, char const * argv[]) {
         ; return EXIT_FAILURE;
 }
 
-// vim: shiftwidth=2 tabstop=2 number foldmethod=marker
+// modeline for vim: shiftwidth=2 tabstop=2 number foldmethod=marker