plugin: improves error detection

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

diff --git a/src/afb-websock.c b/src/afb-websock.c
index 45c65ba..0228ce1 100644 (file)
--- a/src/afb-websock.c
+++ b/src/afb-websock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016 "IoT.bzh"
  * Author: José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,12 +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 ****************************/
 
@@ -103,6 +102,10 @@ static const struct protodef *search_proto(const struct protodef *protodefs, con
        int i;
        size_t len;
 
+       if (protocols == NULL) {
+               /* return NULL; */
+               return protodefs != NULL && protodefs->name != NULL ? protodefs : NULL;
+       }
        for(;;) {
                protocols += strspn(protocols, vseparators);
                if (!*protocols)
@@ -155,7 +158,7 @@ static int check_websocket_upgrade(struct MHD_Connection *con, const struct prot
 
        /* is the protocol supported ? */
        protocols = MHD_lookup_connection_value(con, MHD_HEADER_KIND, sec_websocket_protocol_s);
-       proto = protocols == NULL ? NULL : search_proto(protodefs, protocols);
+       proto = search_proto(protodefs, protocols);
        if (proto == NULL) {
                response = MHD_create_response_from_buffer(0, NULL, MHD_RESPMEM_PERSISTENT);
                MHD_queue_response(con, MHD_HTTP_PRECONDITION_FAILED, response);
@@ -194,7 +197,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 }
 };
 
@@ -209,7 +212,7 @@ int afb_websock_check_upgrade(struct afb_hreq *hreq)
                return 0;
 
        ws = NULL;
-       rc = check_websocket_upgrade(hreq->connection, protodefs, hreq->context.session, &ws);
+       rc = check_websocket_upgrade(hreq->connection, protodefs, &hreq->context, &ws);
        if (rc == 1) {
                hreq->replied = 1;
                if (ws != NULL)