added nonblocking read

Author: DiegoKrupitza

Makefile

@@ -1,8 +1,8 @@
 CC = gcc
 DEFS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_POSIX_C_SOURCE=200809L
 
-CFLAGS = -Wall -g -std=c99 -pedantic $(DEFS)
-SERVEROBJECTS = server.o
+CFLAGS = -Wall -Wno-unused-function -g -std=c99 -pedantic $(DEFS)
+SERVEROBJECTS = server.o httpHeaderManager.o
 .PHONY: all clean
 
 all: clean httpc
@@ -13,7 +13,8 @@ httpc: $(SERVEROBJECTS)
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
-server.o: server.c server.h
+httpHeaderManager.o: httpHeaderManager.c httpHeaderManager.h httpStatusCodes.h
+server.o: server.c server.h httpHeaderManager.o
 
 clean:
 	rm -rf *.o httpc

httpHeaderManager.c

@@ -0,0 +1,35 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "httpHeaderManager.h"
+#include "httpStatusCodes.h"
+
+void responseheaderToString(httpheader_t header, char *headerString)
+{
+    // status code is not longer than 3 digits
+    char *statuscode = calloc(4, sizeof(char));
+    sprintf(statuscode, "%d", header.statuscode);
+
+    // getting the reason for a given status code
+    const char *statusText = HttpStatus_reasonPhrase(header.statuscode);
+
+    int length = sizeof(header.methode) +
+                 sizeof(header.file) +
+                 sizeof(header.httpVersion) +
+                 sizeof(header.host) +
+                 sizeof(header.connection) +
+                 sizeof(header.user_agent) +
+                 sizeof(header.accept_encoding) +
+                 sizeof(header.content_length) +
+                 sizeof(header.content_type) +
+                 sizeof(header.date) +
+                 sizeof(header.last_modified) +
+                 sizeof(statuscode) +
+                 sizeof(statusText) +
+                 2;
+
+    headerString = realloc(headerString, length);
+
+    sprintf(headerString, "%s %s %s\r\n", header.methode, statuscode, statusText);
+    //TODO: implement
+}

httpHeaderManager.h

@@ -0,0 +1,19 @@
+#include "httpStatusCodes.h"
+
+typedef struct
+{
+    char *methode;
+    char *file;
+    char *httpVersion;
+    char *host;
+    char *connection;
+    char *user_agent;
+    char *accept_encoding;
+    char *content_length;
+    char *content_type;
+    char *date;
+    char *last_modified;
+    int statuscode;
+} httpheader_t;
+
+void responseheaderToString(httpheader_t header, char *headerString);

httpStatusCodes.h

@@ -11,6 +11,8 @@
 #include <sys/wait.h>
 
 #include "server.h"
+#include "httpHeaderManager.h"
+#include "httpStatusCodes.h"
 
 void handle_childfork(int singal)
 {
@@ -107,7 +109,7 @@ int validPort(char *port)
  * @param argv the argument vector
  * @param args the container holding the arguments for further processing
  */
-void readArguments(int argc, char *argv[], serverarguments *args)
+void readArguments(int argc, char *argv[], serverarguments_t *args)
 {
     int portFlag = 0;
     int ch = -1;
@@ -152,7 +154,7 @@ void readArguments(int argc, char *argv[], serverarguments *args)
  * @param args the arguments of this programm
  * @return int the servers filedescriptor
  */
-int startServer(serverarguments *args)
+int startServer(serverarguments_t *args)
 {
     struct addrinfo hints, *ai;
     memset(&hints, 0, sizeof hints);
@@ -204,27 +206,40 @@ char *readClientReqest(int clientFd, char *requestContent)
 {
     FILE *clientInput = fdopen(clientFd, "r");
 
-    //TODO: find a way its not blocking
     char line[1024];
     while ((fgets(line, sizeof(line), clientInput)) != 0)
     {
         int newLength = strlen(line) + strlen(requestContent) + 2;
         requestContent = realloc(requestContent, newLength);
         strcat(requestContent, line);
+        if (strcmp("\r\n", line) == 0)
+        {
+            //done
+            break;
+        }
     }
 
-    //fgets(requestContent,sizeof(requestContent),clientInput);
-
     fclose(clientInput);
     return requestContent;
 }
 
+void parseHttpHeader(httpheader_t *parseHttpHeader)
+{
+    //TODO: implement header parsing
+}
+
 void processClientRequest(int clientFd)
 {
     char *requestContent = calloc(1024, sizeof(char));
-
     requestContent = readClientReqest(clientFd, requestContent);
-    printf("%s", requestContent);
+
+    httpheader_t httpheader = {.methode = "GET", .statuscode = 200};
+    parseHttpHeader(&httpheader);
+
+    char *httpHeaderAsString = calloc(2, sizeof(char));
+    responseheaderToString(httpheader, httpHeaderAsString);
+
+    //printf("%s", requestContent);
     fflush(stdout);
 }
 
@@ -249,6 +264,7 @@ void handleNewClient(int clientFd)
     default:
         // parent tasks ...
         // nothing to do
+        // handle in sigaction
         break;
     }
 }
@@ -284,7 +300,7 @@ void clientWaiting(int serverFd)
 int main(int argc, char *argv[])
 {
     signalRegistry();
-    serverarguments args = {
+    serverarguments_t args = {
         .port = DEFAULTPORT};
 
     readArguments(argc, argv, &args);

httpc

@@ -10,7 +10,7 @@
 typedef struct
 {
     char *port;
-} serverarguments;
+} serverarguments_t;
 
 void usage(void);