Eliminate use of AFB_SESSION_CREATE
authorJosé Bollo <jose.bollo@iot.bzh>
Thu, 4 May 2017 09:55:35 +0000 (11:55 +0200)
committerJosé Bollo <jose.bollo@iot.bzh>
Thu, 4 May 2017 09:55:35 +0000 (11:55 +0200)
AFB_SESSION_CREATE is obsolete since a while.

Change-Id: I3dc3eb374f0842d7b210a106b72bce2e4c5c1512
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
src/afb-api-so-v1.c
src/afb-xreq.c

index 4bfd8d9..a81ec17 100644 (file)
@@ -154,8 +154,6 @@ struct json_object *describe_cb(void *closure)
                a = json_object_new_array();
                json_object_object_add(f, "name", json_object_new_string(verb->name));
                json_object_object_add(f, "info", json_object_new_string(verb->info));
-               if (verb->session & AFB_SESSION_CREATE)
-                       json_object_array_add(a, json_object_new_string("session-create"));
                if (verb->session & AFB_SESSION_CLOSE)
                        json_object_array_add(a, json_object_new_string("session-close"));
                if (verb->session & AFB_SESSION_RENEW)
index b54b436..143048c 100644 (file)
@@ -443,7 +443,7 @@ int xreq_session_check(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)) {
@@ -483,7 +475,7 @@ int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
 
 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) {