Prepare xreq to be aware of the version

[src/app-framework-binder.git] / src / afb-api-so-v1.c

diff --git a/src/afb-api-so-v1.c b/src/afb-api-so-v1.c
index 7bb2c32..eedfc01 100644 (file)
--- a/src/afb-api-so-v1.c
+++ b/src/afb-api-so-v1.c
@@ -70,11 +70,7 @@ static void call_cb(void *closure, struct afb_xreq *xreq)
        struct api_so_v1 *desc = closure;
 
        verb = search(desc, xreq->verb);
-       if (!verb)
-               afb_xreq_fail_unknown_verb(xreq);
-       else
-               if (!xreq_session_check_apply(xreq, verb->session))
-                       afb_xreq_call(xreq, verb->callback);
+       afb_xreq_call_verb_v1(xreq, verb);
 }
 
 static int service_start_cb(void *closure, int share_session, int onneed, struct afb_apiset *apiset)
@@ -154,8 +150,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)
@@ -163,7 +157,7 @@ struct json_object *describe_cb(void *closure)
                if (verb->session & AFB_SESSION_CHECK)
                        json_object_array_add(a, json_object_new_string("session-check"));
                if (verb->session & AFB_SESSION_LOA_EQ) {
-                       const char *rel;
+                       const char *rel = "?";
                        char buffer[80];
                        switch (verb->session & AFB_SESSION_LOA_EQ) {
                        case AFB_SESSION_LOA_GE: rel = ">="; break;