Introduce apiset for grouping apis

[src/app-framework-binder.git] / src / afb-subcall.c

diff --git a/src/afb-subcall.c b/src/afb-subcall.c
index 498f73b..8a8c77a 100644 (file)
--- a/src/afb-subcall.c
+++ b/src/afb-subcall.c
@@ -25,9 +25,10 @@
 
 #include "afb-subcall.h"
 #include "afb-msg-json.h"
-#include "afb-apis.h"
+#include "afb-apiset.h"
 #include "afb-context.h"
 #include "afb-xreq.h"
+#include "afb-cred.h"
 #include "verbose.h"
 #include "jobs.h"
 
@@ -58,6 +59,7 @@ static void subcall_destroy(struct afb_xreq *xreq)
        struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
 
        json_object_put(subcall->xreq.json);
+       afb_cred_unref(subcall->xreq.cred);
        afb_xreq_unref(subcall->caller);
        free(subcall);
 }
@@ -87,17 +89,25 @@ static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
 static struct subcall *create_subcall(struct afb_xreq *caller, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
 {
        struct subcall *subcall;
+       size_t lenapi, lenverb;
+       char *copy;
 
-       subcall = calloc(1, sizeof *subcall);
+       lenapi = 1 + strlen(api);
+       lenverb = 1 + strlen(verb);
+       subcall = malloc(lenapi + lenverb + sizeof *subcall);
        if (subcall == NULL) {
                return NULL;
        }
-
        afb_xreq_init(&subcall->xreq, &afb_subcall_xreq_itf);
        afb_context_subinit(&subcall->xreq.context, &caller->context);
+       subcall->xreq.cred = afb_cred_addref(caller->cred);
        subcall->xreq.json = args;
-       subcall->xreq.api = api; /* TODO: alloc ? */
-       subcall->xreq.verb = verb; /* TODO: alloc ? */
+       copy = (char*)&subcall[1];
+       memcpy(copy, api, lenapi);
+       subcall->xreq.api = copy;
+       copy = &copy[lenapi];
+       memcpy(copy, verb, lenverb);
+       subcall->xreq.verb = copy;
        subcall->caller = caller;
        subcall->callback = callback;
        subcall->closure = closure;
@@ -123,8 +133,7 @@ void afb_subcall(
                return;
        }
 
-       afb_apis_call(&subcall->xreq);
-       afb_xreq_unref(&subcall->xreq);
+       afb_xreq_process(&subcall->xreq, caller->apiset);
 }
 
 struct subcall_sync