X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-websock.c;h=3ad9e20dc0951618ab0a8719741ac7beb60791ab;hb=28158192742ead144454e071720d10bf5218a20b;hp=45c65ba7faf8cce694e1e78133c46289a0577afc;hpb=95b6dc2f61f447783c65f98e2e1e2dda16249073;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-websock.c b/src/afb-websock.c
index 45c65ba7..3ad9e20d 100644
--- 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 ****************************/
 
@@ -194,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 }
 };
 
@@ -209,7 +208,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)