X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-stub-ws.c;h=cab58d206b238ef96a93cb51c99633420ae02259;hb=b15edc1c48d74f2ad6e9ade577bf6b4945d85eee;hp=b7e3c94668686e58734b91ed7f0f5b16e8d2a666;hpb=f40979c718fa6fe6b571e133e1bf19fc90957298;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index b7e3c946..cab58d20 100644
--- a/src/afb-stub-ws.c
+++ b/src/afb-stub-ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2019 "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");
@@ -167,7 +167,7 @@ static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *e
 	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
-	rc = afb_evt_event_x2_add_watch(wreq->stubws->listener, event);
+	rc = afb_evt_listener_watch_x2(wreq->stubws->listener, event);
 	if (rc >= 0)
 		rc = afb_proto_ws_call_subscribe(wreq->call,  afb_evt_event_x2_id(event));
 	if (rc < 0)
@@ -177,13 +177,10 @@ static int server_req_subscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *e
 
 static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
-	int rc, rc2;
+	int rc;
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
 	rc = afb_proto_ws_call_unsubscribe(wreq->call,  afb_evt_event_x2_id(event));
-	rc2 = afb_evt_event_x2_remove_watch(wreq->stubws->listener, event);
-	if (rc >= 0 && rc2 < 0)
-		rc = rc2;
 	if (rc < 0)
 		ERROR("error while unsubscribing event");
 	return rc;
@@ -207,7 +204,7 @@ static struct afb_proto_ws *client_get_proto(struct afb_stub_ws *stubws)
 	if (proto == NULL && stubws->robust.reopen) {
 		fdev = stubws->robust.reopen(stubws->robust.closure);
 		if (fdev != NULL)
-			proto = afb_stub_ws_create_proto(stubws, fdev, 0);
+			proto = afb_stub_ws_create_proto(stubws, fdev, 1);
 	}
 	return proto;
 }
@@ -461,7 +458,7 @@ static void server_on_session_remove_cb(void *closure, uint16_t sessionid)
 	struct afb_session *session;
 	int rc;
 	
-	rc = u16id2ptr_drop(&stubws->event_proxies, sessionid, (void**)&session);
+	rc = u16id2ptr_drop(&stubws->session_proxies, sessionid, (void**)&session);
 	if (rc == 0 && session)
 		afb_session_unref(session);
 }
@@ -490,7 +487,7 @@ static void server_on_token_remove_cb(void *closure, uint16_t tokenid)
 	struct afb_token *token;
 	int rc;
 	
-	rc = u16id2ptr_drop(&stubws->event_proxies, tokenid, (void**)&token);
+	rc = u16id2ptr_drop(&stubws->token_proxies, tokenid, (void**)&token);
 	if (rc == 0 && token)
 		afb_token_unref(token);
 }
@@ -499,11 +496,12 @@ static void server_on_event_unexpected_cb(void *closure, uint16_t eventid)
 {
 	struct afb_stub_ws *stubws = closure;
 
-	afb_evt_watch_sub_eventid(stubws->listener, eventid);
+	afb_evt_listener_unwatch_id(stubws->listener, eventid);
 }
 
 static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, uint16_t sessionid, uint16_t tokenid, const char *user_creds)
 {
+	const char *errstr = afb_error_text_internal_error;
 	struct afb_stub_ws *stubws = closure;
 	struct server_req *wreq;
 	struct afb_session *session;
@@ -544,11 +542,12 @@ static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, con
 	afb_xreq_process(&wreq->xreq, stubws->apiset);
 	return;
 
-out_of_memory:
 no_session:
+	errstr = afb_error_text_unknown_session;
+out_of_memory:
 	json_object_put(args);
 	afb_stub_ws_unref(stubws);
-	afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL);
+	afb_proto_ws_call_reply(call, NULL, errstr, NULL);
 	afb_proto_ws_call_unref(call);
 }