#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"
struct subcall;
-static void subcall_destroy(void *closure);
-static void subcall_reply(void *closure, int iserror, struct json_object *obj);
-static int subcall_subscribe(void *closure, struct afb_event event);
-static int subcall_unsubscribe(void *closure, struct afb_event event);
+static void subcall_destroy(struct afb_xreq *xreq);
+static void subcall_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj);
+static int subcall_subscribe(struct afb_xreq *xreq, struct afb_event event);
+static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event);
const struct afb_xreq_query_itf afb_subcall_xreq_itf = {
.reply = subcall_reply,
void *closure;
};
-static void subcall_destroy(void *closure)
+static void subcall_destroy(struct afb_xreq *xreq)
{
- struct subcall *subcall = closure;
+ 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);
}
-static void subcall_reply(void *closure, int iserror, struct json_object *obj)
+static void subcall_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj)
{
- struct subcall *subcall = closure;
+ struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
subcall->callback(subcall->closure, iserror, obj);
json_object_put(obj);
}
-static int subcall_subscribe(void *closure, struct afb_event event)
+static int subcall_subscribe(struct afb_xreq *xreq, struct afb_event event)
{
- struct subcall *subcall = closure;
+ struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
return afb_xreq_subscribe(subcall->caller, event);
}
-static int subcall_unsubscribe(void *closure, struct afb_event event)
+static int subcall_unsubscribe(struct afb_xreq *xreq, struct afb_event event)
{
- struct subcall *subcall = closure;
+ struct subcall *subcall = CONTAINER_OF_XREQ(struct subcall, xreq);
return afb_xreq_unsubscribe(subcall->caller, 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.refcount = 1;
+ subcall->xreq.cred = afb_cred_addref(caller->cred);
subcall->xreq.json = args;
- subcall->xreq.api = api; /* TODO: alloc ? */
- subcall->xreq.verb = verb; /* TODO: alloc ? */
- subcall->xreq.query = subcall;
- subcall->xreq.queryitf = &afb_subcall_xreq_itf;
+ copy = (char*)&subcall[1];
+ memcpy(copy, api, lenapi);
+ subcall->xreq.api = copy;
+ copy = ©[lenapi];
+ memcpy(copy, verb, lenverb);
+ subcall->xreq.verb = copy;
subcall->caller = caller;
subcall->callback = callback;
subcall->closure = closure;
return;
}
- afb_apis_call(&subcall->xreq);
- afb_xreq_unref(&subcall->xreq);
+ afb_xreq_process(&subcall->xreq, caller->apiset);
}
struct subcall_sync