← cproj

string_equal, string_null

b78328ccc6561f06745fcc607548b6be86858531 · ovidiucs · Oct 15, 2019 07:12

+70 −18 · 2 files changed

• graph/sockets/http_server.c +14 −11
• graph/sockets/s.h +56 −7

diff --git a/graph/sockets/http_server.c b/graph/sockets/http_server.c
index 4a2c79c..ebef160 100644
--- a/graph/sockets/http_server.c
+++ b/graph/sockets/http_server.c
@@ -25,7 +25,7 @@
 
 // ----------------------------------------------------------------
 
-int requestError(const char *message);
+int http_error(int code,const char *message);
 void handleRequest(int fd);
 // set 640KB of char array
 
@@ -47,11 +47,12 @@ char response[] =
 // save the jump point
 jmp_buf handleRequestError;
 
-int requestError(const char *message) {
-
+int http_error(int code, const char *message) {
+    (void) code;
     fprintf (stderr, "%s\n",message);
     longjmp (handleRequestError,1);
 }
+
 // Request handler to write to stdout the request comming in
 // from the web client. Takes a file descriptor.
 void handleRequest(int fd) {
@@ -59,10 +60,10 @@ void handleRequest(int fd) {
     ssize_t requestBufSize = read(fd, requestBuffer,REQUEST_BUFFER_CAPACITY);
     // If the allocation was succesfull the read syscall will return 0
     if (requestBufSize == 0) {
-        requestError("EOF");
+        http_error(400,"EOF");
     }
     if (requestBufSize < 0) {
-        requestError(strerror(errno));
+        http_error(500, strerror(errno));
     }
     String buffer = {
         .len = (uint64_t) requestBufSize,
@@ -71,13 +72,12 @@ void handleRequest(int fd) {
 
 
     String line = trim_end(chop_line(&buffer));
-
-    while (buffer.len && line.len) {
-        printf("|%*s|\n", (int)line.len, line.data);
-        //fprintf (stderr, "[INFO] Size of buffer is: %zd bytes\n",line.len);
-        line = trim_end(chop_line(&buffer));
+    if (!line.len) {
+        http_error(400, "Empty status line");
     }
 
+    String method = chop_word(&line);
+    if (string_equal(method, string_null("GET")));
 }
 // ----------------------------------------------------------------
 
@@ -131,6 +131,7 @@ int main (int argc, char **argv) {
 
     //4. Keep accepting connections
     // we will get back a file descriptor
+
     for (;;) {
 
         struct sockaddr_in clientAddr;
@@ -153,7 +154,8 @@ int main (int argc, char **argv) {
             // catch
             fprintf (stderr, "Something went wrong.%s", strerror (errno));
         }
-                // /printf("------------------------------\n");
+
+        printf("------------------------------\n");
 
         // response is array of chars not pointer to char. it can take the sizeof operator
         write(client_fd, response, sizeof(response));
@@ -161,6 +163,7 @@ int main (int argc, char **argv) {
             fprintf(stderr, "Could not send data %s\n", strerror(errno));
         }
         // close the connection
+
         err  = close(client_fd);
         if (err < 0) {
             fprintf(stderr, "Could not close client connection from %s\n", strerror(errno));
diff --git a/graph/sockets/s.h b/graph/sockets/s.h
index 361c4c9..689d1f1 100644
--- a/graph/sockets/s.h
+++ b/graph/sockets/s.h
@@ -1,16 +1,28 @@
 #ifndef S_H_
 #define S_H_
 #include <ctype.h>
+#include <stdint.h>
+#include <string.h>
 
 typedef struct {
     uint64_t len;
-    char *data;
+    const char *data;
 } String;
- 
+
+static inline
+String string_null (const char *s) {
+    String result = {
+        .len = strlen (s),
+        .data = s
+    };
+    return result;
+}
+
 static inline
 String chop_line(String *input) {
     uint64_t i = 0;
-    while (i < input->len &&  input->data[i] != '\n'){
+
+    while (i < input->len &&  input->data[i] != '\n') {
         ++i;
     }
     String line;
@@ -25,13 +37,50 @@ String chop_line(String *input) {
         input->len -= i + 1;
     }
 
-     return *input;
+     return line;
 }
+static inline
+String trim_begin(String s) {
+    while (s.len && isspace(*s.data)){
+        s.data++;
+        s.len--;
+    }
+    return s;
+}
+static inline
 String trim_end(String s){
-    while (s->len && isspace(s->data[s->len -1])) {
-        s->len--;
+    while (s.len && isspace(s.data[s.len -1])) {
+        s.len--;
     }
     return s;
 }
+static inline
+String chop_word(String *input) {
+    *input = trim_begin(*input);
+
+    uint64_t i = 0;
+
+    while (i < input->len && !isspace(input->data[i])) {
+        ++i;
+    }
+
+    String word;
+    word.data = input->data;
+    word.len = i;
+
+    input->data  += i;
+    input->len  -= 1;
+
+    return word;
+}
+
+static inline
+int string_equal(String a, String b) {
+    if (a.len != b.len) {
+        return 0;
+    }
+    return memcmp(a.data, b.data, a.len) == 0;
+}
+
 
-#endif // S_H_
\ No newline at end of file
+#endif // S_H_