X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-websock.c;h=abdcfa1d149ce3dc8d0e848e86dfd3776d690fb6;hb=5d248158cc380d0a164fa56b46a7bdede4115407;hp=45c65ba7faf8cce694e1e78133c46289a0577afc;hpb=ed54e8410771ee5f13c76f968086c6aa098a750d;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-websock.c b/src/afb-websock.c
index 45c65ba7..abdcfa1d 100644
--- a/src/afb-websock.c
+++ b/src/afb-websock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 IoT.bzh
+ * Copyright (C) 2016, 2017 "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->xreq.context, &ws);
 	if (rc == 1) {
 		hreq->replied = 1;
 		if (ws != NULL)