X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=7621b8017c1d6f9f06d0afce1ce30e3c716b2d10;hb=d735ff81293a2de1860a99afef891ac3fc6c1c09;hp=f4756a9fc7b1e15de04069be1f664226a4c18db0;hpb=a2cf84ecde926adeebf09bc2c284401513d3fab3;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index f4756a9f..7621b801 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -202,12 +202,15 @@ static int xreq_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct
 
 int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
-	if (xreq->listener)
-		return afb_evt_event_x2_add_watch(xreq->listener, event);
-	if (xreq->queryitf->subscribe)
-		return xreq->queryitf->subscribe(xreq, event);
-	ERROR("no event listener, subscription impossible");
-	errno = EINVAL;
+	if (xreq->replied) {
+		ERROR("request replied, subscription impossible");
+		errno = EINVAL;
+	} else {
+		if (xreq->queryitf->subscribe)
+			return xreq->queryitf->subscribe(xreq, event);
+		ERROR("no event listener, subscription impossible");
+		errno = ENOTSUP;
+	}
 	return -1;
 }
 
@@ -224,12 +227,15 @@ static int xreq_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struc
 
 int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event)
 {
-	if (xreq->listener)
-		return afb_evt_event_x2_remove_watch(xreq->listener, event);
-	if (xreq->queryitf->unsubscribe)
-		return xreq->queryitf->unsubscribe(xreq, event);
-	ERROR("no event listener, unsubscription impossible");
-	errno = EINVAL;
+	if (xreq->replied) {
+		ERROR("request replied, unsubscription impossible");
+		errno = EINVAL;
+	} else {
+		if (xreq->queryitf->unsubscribe)
+			return xreq->queryitf->unsubscribe(xreq, event);
+		ERROR("no event listener, unsubscription impossible");
+		errno = ENOTSUP;
+	}
 	return -1;
 }
 
@@ -314,7 +320,7 @@ static struct json_object *xreq_get_client_info_cb(struct afb_req_x2 *closure)
 		json_object_object_add(r, "id", json_object_new_string(xreq->cred->id));
 	}
 	if (xreq->context.session) {
-		json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)));
+		json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)?:""));
 		json_object_object_add(r, "LOA", json_object_new_int(afb_context_get_loa(&xreq->context)));
 	}
 	return r;
@@ -722,6 +728,7 @@ int afb_xreq_legacy_subcall_sync(struct afb_xreq *xreq, const char *api, const c
 	return afb_req_x2_subcall_sync_legacy(xreq_to_req_x2(xreq), api, verb, args, result);
 }
 
+#if WITH_LEGACY_BINDING_V1
 static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
 {
 	int loa;
@@ -753,9 +760,6 @@ static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
 		}
 	}
 
-	if ((sessionflags & AFB_SESSION_RENEW_X1) != 0) {
-		afb_context_refresh(&xreq->context);
-	}
 	if ((sessionflags & AFB_SESSION_CLOSE_X1) != 0) {
 		afb_context_change_loa(&xreq->context, 0);
 		afb_context_close(&xreq->context);
@@ -763,6 +767,7 @@ static int xreq_session_check_apply_v1(struct afb_xreq *xreq, int sessionflags)
 
 	return 0;
 }
+#endif
 
 static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionflags, const struct afb_auth *auth)
 {
@@ -790,9 +795,6 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl
 		return -1;
 	}
 
-	if ((sessionflags & AFB_SESSION_REFRESH_X2) != 0) {
-		afb_context_refresh(&xreq->context);
-	}
 	if ((sessionflags & AFB_SESSION_CLOSE_X2) != 0) {
 		afb_context_close(&xreq->context);
 	}
@@ -800,6 +802,7 @@ static int xreq_session_check_apply_v2(struct afb_xreq *xreq, uint32_t sessionfl
 	return 0;
 }
 
+#if WITH_LEGACY_BINDING_V1
 void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb)
 {
 	if (!verb)
@@ -808,7 +811,9 @@ void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1
 		if (!xreq_session_check_apply_v1(xreq, verb->session))
 			verb->callback(xreq_to_req_x1(xreq));
 }
+#endif
 
+#if WITH_LEGACY_BINDING_V2
 void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
 {
 	if (!verb)
@@ -817,6 +822,7 @@ void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb
 		if (!xreq_session_check_apply_v2(xreq, verb->session, verb->auth))
 			verb->callback(xreq_to_req_x1(xreq));
 }
+#endif
 
 void afb_xreq_call_verb_v3(struct afb_xreq *xreq, const struct afb_verb_v3 *verb)
 {