Use uSockets v0.5.0

benchmarks/broadcast_test.c

@@ -91,7 +91,7 @@ struct us_socket_t *on_http_socket_writable(struct us_socket_t *s) {
     return s;
 }
 
-struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
+struct us_socket_t *on_http_socket_close(struct us_socket_t *s, int code, void *reason) {
 
     printf("Client was disconnected, exiting!\n");
     exit(-1);
@@ -100,7 +100,7 @@ struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
 }
 
 struct us_socket_t *on_http_socket_end(struct us_socket_t *s) {
-    return us_socket_close(SSL, s);
+    return us_socket_close(SSL, s, 0, NULL);
 }
 
 struct us_socket_t *on_http_socket_data(struct us_socket_t *s, char *data, int length) {

benchmarks/load_test.c

@@ -75,7 +75,7 @@ struct us_socket_t *on_http_socket_writable(struct us_socket_t *s) {
     return s;
 }
 
-struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
+struct us_socket_t *on_http_socket_close(struct us_socket_t *s, int code, void *reason) {
 
     printf("Closed!\n");
 
@@ -83,7 +83,7 @@ struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
 }
 
 struct us_socket_t *on_http_socket_end(struct us_socket_t *s) {
-    return us_socket_close(SSL, s);
+    return us_socket_close(SSL, s, 0, NULL);
 }
 
 struct us_socket_t *on_http_socket_data(struct us_socket_t *s, char *data, int length) {

benchmarks/scale_test.c

@@ -93,7 +93,7 @@ struct us_socket_t *on_http_socket_writable(struct us_socket_t *s) {
     return s;
 }
 
-struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
+struct us_socket_t *on_http_socket_close(struct us_socket_t *s, int code, void *reason) {
 
     closed_connections++;
     if (closed_connections % 1000 == 0) {
@@ -104,7 +104,7 @@ struct us_socket_t *on_http_socket_close(struct us_socket_t *s) {
 }
 
 struct us_socket_t *on_http_socket_end(struct us_socket_t *s) {
-    return us_socket_close(SSL, s);
+    return us_socket_close(SSL, s, 0, NULL);
 }
 
 // should never get a response!

src/AsyncSocket.h

@@ -62,7 +62,7 @@ protected:
 
     /* Immediately close socket */
     us_socket_t *close() {
-        return us_socket_close(SSL, (us_socket_t *) this);
+        return us_socket_close(SSL, (us_socket_t *) this, 0, nullptr);
     }
 
     /* Cork this socket. Only one socket may ever be corked per-loop at any given time */

src/HttpContext.h

@@ -79,7 +79,7 @@ private:
         });
 
         /* Handle socket disconnections */
-        us_socket_context_on_close(SSL, getSocketContext(), [](us_socket_t *s) {
+        us_socket_context_on_close(SSL, getSocketContext(), [](us_socket_t *s, int code, void *reason) {
             /* Get socket ext */
             HttpResponseData<SSL> *httpResponseData = (HttpResponseData<SSL> *) us_socket_ext(SSL, s);
 
@@ -144,7 +144,7 @@ private:
 
                 /* Are we not ready for another request yet? Terminate the connection. */
                 if (httpResponseData->state & HttpResponseData<SSL>::HTTP_RESPONSE_PENDING) {
-                    us_socket_close(SSL, (us_socket_t *) s);
+                    us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
                     return nullptr;
                 }
 
@@ -155,7 +155,7 @@ private:
                 httpContextData->router.getUserData() = {(HttpResponse<SSL> *) s, httpRequest};
                 if (!httpContextData->router.route(httpRequest->getMethod(), httpRequest->getUrl())) {
                     /* We have to force close this socket as we have no handler for it */
-                    us_socket_close(SSL, (us_socket_t *) s);
+                    us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
                     return nullptr;
                 }
 
@@ -225,7 +225,7 @@ private:
                 return user;
             }, [](void *user) {
                  /* Close any socket on HTTP errors */
-                us_socket_close(SSL, (us_socket_t *) user);
+                us_socket_close(SSL, (us_socket_t *) user, 0, nullptr);
                 return nullptr;
             });
 

src/WebSocketContext.h

@@ -53,7 +53,7 @@ private:
     }
 
     static void forceClose(uWS::WebSocketState<isServer> *wState, void *s) {
-        us_socket_close(SSL, (us_socket_t *) s);
+        us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
     }
 
     /* Returns true on breakage */
@@ -237,7 +237,7 @@ private:
          * any backpressure from HTTP state kept. */
 
         /* Handle socket disconnections */
-        us_socket_context_on_close(SSL, getSocketContext(), [](auto *s) {
+        us_socket_context_on_close(SSL, getSocketContext(), [](auto *s, int code, void *reason) {
             /* For whatever reason, if we already have emitted close event, do not emit it again */
             WebSocketData *webSocketData = (WebSocketData *) (us_socket_ext(SSL, s));
             if (!webSocketData->isShuttingDown) {
@@ -351,7 +351,7 @@ private:
         us_socket_context_on_end(SSL, getSocketContext(), [](auto *s) {
 
             /* If we get a fin, we just close I guess */
-            us_socket_close(SSL, (us_socket_t *) s);
+            us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
 
             return s;
         });
@@ -360,7 +360,7 @@ private:
         us_socket_context_on_timeout(SSL, getSocketContext(), [](auto *s) {
 
             /* Timeout is very simple; we just close it */
-            us_socket_close(SSL, (us_socket_t *) s);
+            us_socket_close(SSL, (us_socket_t *) s, 0, nullptr);
 
             return s;
         });