X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-stub-ws.c;h=11cad076913e60b61c5dfb2eae145933cef66773;hb=65353dce81a629e042800bb7b86fcd869a76727e;hp=d538fc65f9ebb40f1942b152e55e28a490a65620;hpb=7386e1c5090b4e76036bc212f2a2cf32920bb160;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c
index d538fc65..11cad076 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");
@@ -44,6 +44,7 @@
 #include "afb-evt.h"
 #include "afb-xreq.h"
 #include "afb-token.h"
+#include "afb-error-text.h"
 #include "verbose.h"
 #include "fdev.h"
 #include "jobs.h"
@@ -144,7 +145,6 @@ static void server_req_destroy_cb(struct afb_xreq *xreq)
 	struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
 
 	afb_context_disconnect(&wreq->xreq.context);
-	afb_cred_unref(wreq->xreq.cred);
 	json_object_put(wreq->xreq.json);
 	afb_proto_ws_call_unref(wreq->call);
 	afb_stub_ws_unref(wreq->stubws);
@@ -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;
@@ -262,7 +259,7 @@ static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
 
 	proto = client_get_proto(stubws);
 	if (proto == NULL) {
-		afb_xreq_reply(xreq, NULL, "disconnected", "server hung up");
+		afb_xreq_reply(xreq, NULL, afb_error_text_disconnected, NULL);
 		return;
 	}
 
@@ -279,7 +276,7 @@ static void client_api_call_cb(void * closure, struct afb_xreq *xreq)
 				xreq_on_behalf_cred_export(xreq));
 	}
 	if (rc < 0) {
-		afb_xreq_reply(xreq, NULL, "internal", "can't send message");
+		afb_xreq_reply(xreq, NULL, afb_error_text_internal_error, "can't send message");
 		afb_xreq_unhooked_unref(xreq);
 	}
 }
@@ -414,9 +411,11 @@ static void client_on_event_push_cb(void *closure, uint16_t event_id, struct jso
 
 	rc = u16id2ptr_get(stubws->event_proxies, event_id, (void**)&event);
 	if (rc >= 0 && event)
-		afb_evt_event_x2_push(event, data);
+		rc = afb_evt_event_x2_push(event, data);
 	else
 		ERROR("unreadable push event");
+	if (rc <= 0)
+		afb_proto_ws_client_event_unexpected(stubws->proto, event_id);
 }
 
 static void client_on_event_broadcast_cb(void *closure, const char *event_name, struct json_object *data, const uuid_binary_t uuid, uint8_t hop)
@@ -493,6 +492,13 @@ static void server_on_token_remove_cb(void *closure, uint16_t tokenid)
 		afb_token_unref(token);
 }
 
+static void server_on_event_unexpected_cb(void *closure, uint16_t eventid)
+{
+	struct afb_stub_ws *stubws = closure;
+
+	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)
 {
 	struct afb_stub_ws *stubws = closure;
@@ -525,10 +531,10 @@ static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, con
 	wreq->call = call;
 
 	/* init the context */
-	afb_context_init(&wreq->xreq.context, session, token);
+	afb_context_init(&wreq->xreq.context, session, token, stubws->cred);
+	afb_context_on_behalf_import(&wreq->xreq.context, user_creds);
 
 	/* makes the call */
-	wreq->xreq.cred = afb_cred_mixed_on_behalf_import(stubws->cred, &wreq->xreq.context, user_creds);
 	wreq->xreq.request.called_api = stubws->apiname;
 	wreq->xreq.request.called_verb = verb;
 	wreq->xreq.json = args;
@@ -539,7 +545,7 @@ out_of_memory:
 no_session:
 	json_object_put(args);
 	afb_stub_ws_unref(stubws);
-	afb_proto_ws_call_reply(call, NULL, "internal-error", NULL);
+	afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL);
 	afb_proto_ws_call_unref(call);
 }
 
@@ -583,7 +589,8 @@ static const struct afb_proto_ws_server_itf server_itf =
 	.on_token_create = server_on_token_create_cb,
 	.on_token_remove = server_on_token_remove_cb,
 	.on_call = server_on_call_cb,
-	.on_describe = server_on_describe_cb
+	.on_describe = server_on_describe_cb,
+	.on_event_unexpected = server_on_event_unexpected_cb
 };
 
 /* the interface for events pushing */