Update copyright dates

[src/app-framework-binder.git] / src / afb-websock.c

diff --git a/src/afb-websock.c b/src/afb-websock.c
index 277c9df..df835d6 100644 (file)
--- a/src/afb-websock.c
+++ b/src/afb-websock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,6 +30,8 @@
 #include "afb-hreq.h"
 #include "afb-websock.h"
 #include "afb-ws-json1.h"
+#include "afb-fdev.h"
+#include "fdev.h"
 
 /**************** WebSocket connection upgrade ****************************/
 
@@ -94,7 +96,7 @@ static int headerhas(const char *header, const char *needle)
 struct protodef
 {
        const char *name;
-       void *(*create)(int fd, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure);
+       void *(*create)(struct fdev *fdev, struct afb_apiset *apiset, struct afb_context *context, void (*cleanup)(void*), void *cleanup_closure);
 };
 
 static const struct protodef *search_proto(const struct protodef *protodefs, const char *protocols)
@@ -142,13 +144,23 @@ static void upgrade_to_websocket(
 {
        struct memo_websocket *memo = cls;
        void *ws;
+       struct fdev *fdev;
 
-       ws = memo->proto->create(sock, memo->apiset, &memo->hreq->xreq.context, close_websocket, urh);
-       if (ws == NULL) {
+       fdev = afb_fdev_create(sock);
+       if (!fdev) {
                /* TODO */
                close_websocket(urh);
+       } else {
+               fdev_set_autoclose(fdev, 0);
+               ws = memo->proto->create(fdev, memo->apiset, &memo->hreq->xreq.context, close_websocket, urh);
+               if (ws == NULL) {
+                       /* TODO */
+                       close_websocket(urh);
+               }
        }
+#if MHD_VERSION <= 0x00095900
        afb_hreq_unref(memo->hreq);
+#endif
        free(memo);
 }
 
@@ -215,7 +227,6 @@ static int check_websocket_upgrade(struct MHD_Connection *con, const struct prot
        make_accept_value(key, acceptval);
        MHD_add_response_header(response, sec_websocket_accept_s, acceptval);
        MHD_add_response_header(response, sec_websocket_protocol_s, proto->name);
-       MHD_add_response_header(response, MHD_HTTP_HEADER_CONNECTION, MHD_HTTP_HEADER_UPGRADE);
        MHD_add_response_header(response, MHD_HTTP_HEADER_UPGRADE, websocket_s);
        MHD_queue_response(con, MHD_HTTP_SWITCHING_PROTOCOLS, response);
        MHD_destroy_response(response);