better naming for protocol

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

diff --git a/src/afb-websock.c b/src/afb-websock.c
index 9f5619f..f9c9dd0 100644 (file)
--- a/src/afb-websock.c
+++ b/src/afb-websock.c
@@ -25,11 +25,11 @@
 #include <openssl/sha.h>
 #include <microhttpd.h>
 
-#include "afb-ws-json.h"
-
 #include "afb-method.h"
+#include "afb-context.h"
 #include "afb-hreq.h"
 #include "afb-websock.h"
+#include "afb-ws-json1.h"
 
 /**************** WebSocket connection upgrade ****************************/
 
@@ -117,6 +117,7 @@ static const struct protodef *search_proto(const struct protodef *protodefs, con
 
 static int check_websocket_upgrade(struct MHD_Connection *con, const struct protodef *protodefs, void *context, void **websock)
 {
+       const union MHD_ConnectionInfo *info;
        struct MHD_Response *response;
        const char *connection, *upgrade, *key, *version, *protocols;
        char acceptval[29];
@@ -162,10 +163,14 @@ static int check_websocket_upgrade(struct MHD_Connection *con, const struct prot
        }
 
        /* create the web socket */
-       ws = proto->create(MHD_get_connection_info(con, MHD_CONNECTION_INFO_CONNECTION_FD)->connect_fd,
-                       context,
-                       (void*)MHD_resume_connection,
-                       con);
+       info = MHD_get_connection_info(con, MHD_CONNECTION_INFO_CONNECTION_FD);
+       if (info == NULL) {
+               response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
+               MHD_queue_response(con, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
+               MHD_destroy_response(response);
+               return 1;
+       }
+       ws = proto->create(info->connect_fd, context, (void*)MHD_resume_connection, con);
        if (ws == NULL) {
                response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
                MHD_queue_response(con, MHD_HTTP_INTERNAL_SERVER_ERROR, response);
@@ -188,7 +193,7 @@ static int check_websocket_upgrade(struct MHD_Connection *con, const struct prot
 }
 
 static const struct protodef protodefs[] = {
-       { "x-afb-ws-json1",     (void*)afb_ws_json_create },
+       { "x-afb-ws-json1",     (void*)afb_ws_json1_create },
        { NULL, NULL }
 };
 
@@ -203,7 +208,7 @@ int afb_websock_check_upgrade(struct afb_hreq *hreq)
                return 0;
 
        ws = NULL;
-       rc = check_websocket_upgrade(hreq->connection, protodefs, afb_hreq_context(hreq), &ws);
+       rc = check_websocket_upgrade(hreq->connection, protodefs, hreq->context.session, &ws);
        if (rc == 1) {
                hreq->replied = 1;
                if (ws != NULL)