X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-xreq.c;h=d6cf91fd12fbf926f5a8c8fbc4fb41eac8597088;hb=8a5d14c58817b7ee03f8e22ba734fdd8cc2bc780;hp=b54b4365223ddc4ac8bb63fa0fe0753a18d8c072;hpb=968c3fca18c7518f240d2487a561e8df8b2907a7;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-xreq.c b/src/afb-xreq.c
index b54b4365..d6cf91fd 100644
--- a/src/afb-xreq.c
+++ b/src/afb-xreq.c
@@ -439,11 +439,11 @@ void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb,
 	afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
 }
 
-int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
+static int xreq_session_check_apply(struct afb_xreq *xreq, int sessionflags)
 {
 	int loa;
 
-	if ((sessionflags & (AFB_SESSION_CREATE|AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
+	if ((sessionflags & (AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
 		if (!afb_context_check(&xreq->context)) {
 			afb_context_close(&xreq->context);
 			afb_xreq_fail_f(xreq, "failed", "invalid token's identity");
@@ -452,14 +452,6 @@ int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
 		}
 	}
 
-	if ((sessionflags & AFB_SESSION_CREATE) != 0) {
-		if (afb_context_check_loa(&xreq->context, 1)) {
-			afb_xreq_fail_f(xreq, "failed", "invalid creation state");
-			errno = EINVAL;
-			return -1;
-		}
-	}
-
 	if ((sessionflags & AFB_SESSION_LOA_GE) != 0) {
 		loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
 		if (!afb_context_check_loa(&xreq->context, loa)) {
@@ -478,38 +470,33 @@ int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
 		}
 	}
 
-	return 0;
-}
-
-void xreq_session_apply(struct afb_xreq *xreq, int sessionflags)
-{
-	if ((sessionflags & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) {
+	if ((sessionflags & AFB_SESSION_RENEW) != 0) {
 		afb_context_refresh(&xreq->context);
 	}
 	if ((sessionflags & AFB_SESSION_CLOSE) != 0) {
 		afb_context_change_loa(&xreq->context, 0);
 		afb_context_close(&xreq->context);
 	}
-}
-
-int xreq_session_check_apply(struct afb_xreq *xreq, int sessionflags)
-{
-	int rc = xreq_session_check(xreq, sessionflags);
-	if (!rc)
-		xreq_session_apply(xreq, sessionflags);
 
-	return rc;
+	return 0;
 }
 
-void afb_xreq_call(struct afb_xreq *xreq, void (*method)(struct afb_req req))
+void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb)
 {
-	method(to_req(xreq));
+	if (!verb)
+		afb_xreq_fail_unknown_verb(xreq);
+	else
+		if (!xreq_session_check_apply(xreq, verb->session))
+			verb->callback(to_req(xreq));
 }
 
-void afb_xreq_check_apply_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req))
+void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb)
 {
-	if (!xreq_session_check_apply(xreq, sessionflags))
-		method(to_req(xreq));
+	if (!verb)
+		afb_xreq_fail_unknown_verb(xreq);
+	else
+		if (!xreq_session_check_apply(xreq, verb->session))
+			verb->callback(to_req(xreq));
 }
 
 void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)