example_config/example.config

@@ -1,6 +0,0 @@
-PATH=/
-HTML='''Test HTML
-{{{Var}}}
-'''
-
-Var='''Test var value'''

src/arg_parse.c

@@ -24,7 +24,6 @@
 void print_usage(void) {
   puts("Usage:");
   puts("  -p <port> | --port <port>");
-  puts("  --config=<config_file>");
 }
 
 Args parse_args(int argc, char **argv) {
@@ -43,8 +42,6 @@ Args parse_args(int argc, char **argv) {
       }
       --argc;
       ++argv;
-    } else if (strncmp(argv[0], "--config=", 9) == 0 && strlen(argv[0]) > 9) {
-      args.config_file = argv[0] + 9;
     } else {
       puts("ERROR: Invalid args!\n");
       print_usage();

src/arg_parse.h

@@ -20,8 +20,6 @@
 typedef struct Args {
   unsigned short flags;
   unsigned short port;
-  // Does not need to be free'd, this should point to a string in argv.
-  const char *config_file;
 } Args;
 
 void print_usage(void);

src/http.c

@@ -21,12 +21,8 @@
 #include <string.h>
 #include <stdio.h>
 
-// Third party includes.
-#include <SimpleArchiver/src/helpers.h>
-
 // Local includes
 #include "constants.h"
-#include "http_template.h"
 
 #define REQUEST_TYPE_BUFFER_SIZE 16
 #define REQUEST_PATH_BUFFER_SIZE 256
@@ -35,11 +31,7 @@
 char *c_simple_http_request_response(
     const char *request,
     unsigned int size,
-    const C_SIMPLE_HTTP_HTTPTemplates *templates,
-    size_t *out_size) {
-  if (out_size) {
-    *out_size = 0;
-  }
+    const C_SIMPLE_HTTP_HTTPTemplates *templates) {
   // parse first line.
   unsigned int idx = 0;
   char request_type[REQUEST_TYPE_BUFFER_SIZE] = {0};
@@ -110,26 +102,8 @@ char *c_simple_http_request_response(
   fprintf(stderr, "Parsing request: got http protocol \"%s\"\n", request_proto);
 #endif
 
-  if (strcmp(request_type, "GET") != 0) {
-    fprintf(stderr, "ERROR Only GET requests are allowed!\n");
+  // TODO
   return NULL;
 }
 
-  size_t generated_size = 0;
-  char *generated_buf = c_simple_http_path_to_generated(
-    request_path,
-    templates,
-    &generated_size);
-  if (!generated_buf || generated_size == 0) {
-    fprintf(stderr, "ERROR Unable to generate response html for path \"%s\"!\n",
-      request_path);
-    return NULL;
-  }
-
-  if (out_size) {
-    *out_size = generated_size;
-  }
-  return generated_buf;
-}
-
 // vim: ts=2 sts=2 sw=2

src/http.h

@@ -17,9 +17,6 @@
 #ifndef SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_H_
 #define SEODISPARATE_COM_C_SIMPLE_HTTP_HTTP_H_
 
-// Standard library includes.
-#include <stddef.h>
-
 // Third party includes.
 #include <SimpleArchiver/src/data_structures/hash_map.h>
 
@@ -33,8 +30,7 @@ typedef C_SIMPLE_HTTP_ParsedConfig C_SIMPLE_HTTP_HTTPTemplates;
 char *c_simple_http_request_response(
   const char *request,
   unsigned int size,
-  const C_SIMPLE_HTTP_HTTPTemplates *templates,
-  size_t *out_size
+  const C_SIMPLE_HTTP_HTTPTemplates *templates
 );
 
 #endif

src/main.c

@@ -27,9 +27,6 @@
 #include <time.h>
 #include <errno.h>
 
-// Third party includes.
-#include <SimpleArchiver/src/helpers.h>
-
 // Local includes.
 #include "arg_parse.h"
 #include "big_endian.h"
@@ -42,21 +39,7 @@
 int main(int argc, char **argv) {
   Args args = parse_args(argc, argv);
 
-  if (!args.config_file) {
-    fprintf(stderr, "ERROR Config file not specified!\n");
-    print_usage();
-    return 2;
-  }
-
-  printf("listening on port: %u\n", args.port);
-  printf("config file is: %s\n", args.config_file);
-
-  __attribute__((cleanup(c_simple_http_clean_up_parsed_config)))
-  C_SIMPLE_HTTP_ParsedConfig parsed_config = c_simple_http_parse_config(
-    args.config_file,
-    "PATH",
-    NULL
-  );
+  printf("%u\n", args.port);
 
   __attribute__((cleanup(cleanup_tcp_socket))) int tcp_socket =
     create_tcp_socket(args.port);
@@ -112,38 +95,12 @@ int main(int argc, char **argv) {
         }
       }
       puts("");
-
-      size_t response_size = 0;
+      // TODO Validate request and send response.
+      // TODO WIP
       const char *response = c_simple_http_request_response(
-        (const char*)recv_buf, read_ret, &parsed_config, &response_size);
+        (const char*)recv_buf, read_ret, NULL);
       if (response) {
-        write(connection_fd, "HTTP/1.1 200 OK\n", 16);
-        write(connection_fd, "Allow: GET\n", 11);
-        write(connection_fd, "Content-Type: text/html\n", 24);
-        char content_length_buf[128];
-        size_t content_length_buf_size = 0;
-        memcpy(content_length_buf, "Content-Length: ", 16);
-        content_length_buf_size = 16;
-        int written = 0;
-        snprintf(
-          content_length_buf + content_length_buf_size,
-          127 - content_length_buf_size,
-          "%lu\n%n",
-          response_size,
-          &written);
-        content_length_buf_size += written;
-        write(connection_fd, content_length_buf, content_length_buf_size);
-        write(connection_fd, "\n", 1);
-        write(connection_fd, response, response_size);
-
         free((void*)response);
-      } else {
-        // TODO handle internal errors also.
-        write(connection_fd, "HTTP/1.1 404 Not Found\n", 23);
-        write(connection_fd, "Allow: GET\n", 11);
-        write(connection_fd, "Content-Type: text/html\n", 24);
-        write(connection_fd, "Content-Length: 14\n", 19);
-        write(connection_fd, "\n404 Not Found\n", 15);
       }
       close(connection_fd);
     } else {