From 1d94e90dd77686080db8fa3797a9e7f47cc7ccd8 Mon Sep 17 00:00:00 2001
From: Alex Hultman <alexhultman@gmail.com>
Date: Tue, 28 Aug 2018 06:42:04 +0200
Subject: [PATCH] Port to uSockets v0.0.4

---
 main.cpp  |  2 ++
 src/App.h | 14 +++++++++++++-
 uSockets  |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/main.cpp b/main.cpp
index dbe4e75..9aa2f34 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,6 +35,8 @@ std::string_view getFile(std::string_view file) {
         char *key = (char *) malloc(file.length());
         memcpy(key, file.data(), file.length());
 
+        std::cout << "Size: " << oss.str().size() << std::endl;
+
         cache[std::string_view(key, file.length())] = std::string_view(cachedFile, oss.str().size());
 
         return getFile(file);
diff --git a/src/App.h b/src/App.h
index d529d7a..2a6c005 100644
--- a/src/App.h
+++ b/src/App.h
@@ -65,7 +65,7 @@ protected:
     void init(us_loop *loop) {
             new (data = (Data *) static_dispatch(us_ssl_socket_context_ext, us_socket_context_ext)(httpServerContext)) Data();
 
-            static_dispatch(us_ssl_socket_context_on_open, us_socket_context_on_open)(httpServerContext, [](auto *s) {
+            static_dispatch(us_ssl_socket_context_on_open, us_socket_context_on_open)(httpServerContext, [](auto *s, int is_client) {
                 Data *appData = (Data *) static_dispatch(us_ssl_socket_context_ext, us_socket_context_ext)(static_dispatch(us_ssl_socket_get_context, us_socket_get_context)(s));
 
                 static_dispatch(us_ssl_socket_timeout, us_socket_timeout)(s, HTTP_IDLE_TIMEOUT_S);
@@ -75,6 +75,8 @@ protected:
                 if (appData->onHttpConnection) {
                     appData->onHttpConnection((HttpSocket<SSL> *) s);
                 }
+
+                return s;
             });
 
             static_dispatch(us_ssl_socket_context_on_close, us_socket_context_on_close)(httpServerContext, [](auto *s) {
@@ -85,6 +87,8 @@ protected:
                 if (appData->onHttpDisconnection) {
                     appData->onHttpDisconnection((HttpSocket<SSL> *) s);
                 }
+
+                return s;
             });
 
             static_dispatch(us_ssl_socket_context_on_data, us_socket_context_on_data)(httpServerContext, [](auto *s, char *data, int length) {
@@ -100,6 +104,8 @@ protected:
                 // compared to routing directly
                 //typename Data::UserData user = {(HttpSocket<SSL> *) s, nullptr};
                 //appData->r.route("GET", 3, "/", 1, &user);
+
+                return s;
             });
 
             static_dispatch(us_ssl_socket_context_on_writable, us_socket_context_on_writable)(httpServerContext, [](auto *s) {
@@ -110,10 +116,14 @@ protected:
                 static_dispatch(us_ssl_socket_timeout, us_socket_timeout)(s, HTTP_IDLE_TIMEOUT_S);
 
                 ((HttpSocket<SSL> *) s)->onWritable();
+
+                return s;
             });
 
             static_dispatch(us_ssl_socket_context_on_end, us_socket_context_on_end)(httpServerContext, [](auto *s) {
                 std::cout << "Socket was half-closed!" << std::endl;
+
+                return s;
             });
 
             static_dispatch(us_ssl_socket_context_on_timeout, us_socket_context_on_timeout)(httpServerContext, [](auto *s) {
@@ -127,6 +137,8 @@ protected:
                     static_dispatch(us_ssl_socket_shutdown, us_socket_shutdown)(s);
                 }
 
+                return s;
+
             });
         }
 
diff --git a/uSockets b/uSockets
index 1b19930..7453ee4 160000
--- a/uSockets
+++ b/uSockets
@@ -1 +1 @@
-Subproject commit 1b1993045b548250c0ed1cb6a52eb2c74489ed67
+Subproject commit 7453ee4ec8eee404229e23021197c1d7c2a58369