Move things around some more

15.pro

@@ -13,11 +13,11 @@ SOURCES += \
     uSockets/src/loop.c
 
 HEADERS += \
-    src/http/HttpRouter.h \
+    src/new_design/HttpRouter.h \
     src/Loop.h \
     src/App.h \
     src/http/HttpSocket.h \
-    src/http/HttpParser.h \
+    src/new_design/HttpParser.h \
     src/websocket/libwshandshake.hpp \
     src/websocket/WebSocketProtocol.h \
     src/websocket/WebSocket.h \

src/http/HttpApp.h

@@ -1,10 +1,12 @@
 #ifndef HTTPAPP_H
 #define HTTPAPP_H
 
+// todo: move all this logic to HttpContext
+
 #include <type_traits>
 #include "Loop.h"
 #include "HttpSocket.h"
-#include "HttpRouter.h"
+#include "../new_design/HttpRouter.h"
 #include "websocket/libwshandshake.hpp"
 #include "websocket/WebSocket.h"
 

src/http/HttpSocket.h

@@ -2,7 +2,7 @@
 #define HTTP_H
 
 #include "Socket.h"
-#include "HttpParser.h"
+#include "../new_design/HttpParser.h"
 
 #include <cstring>
 #include <algorithm>

src/new_design/HttpContext.h

@@ -48,6 +48,8 @@ public:
 
         // todo: inplace initialize the data struct!
 
+        // todo: actually register handlers on the socket context with the behavior of HTTP! (take from HttpApp.h)
+
         return (HttpContext *) us_create_socket_context(loop, sizeof(HttpContextData<SSL>));
     }
 

src/new_design/HttpContextData.h

@@ -1,10 +1,9 @@
 #ifndef HTTPCONTEXTDATA_H
 #define HTTPCONTEXTDATA_H
 
-// this means we will depend on HttpRouter and HttpParser here!
-#include "../http/HttpParser.h"
-
-#include "../http/HttpRouter.h"
+// we depend on these
+#include "HttpParser.h"
+#include "HttpRouter.h"
 
 #include <functional>