+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ return afb_calls_legacy_subcall_v2(xreq, api, verb, args, callback, closure);
+}
+
+static void xreq_legacy_subcall_request_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2*), void *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ return afb_calls_legacy_subcall_v3(xreq, api, verb, args, callback, closure);
+}
+
+
+static int xreq_legacy_subcallsync_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ return afb_calls_legacy_subcall_sync(xreq, api, verb, args, result);
+}
+
+static void xreq_vverbose_cb(struct afb_req_x2 *closure, int level, const char *file, int line, const char *func, const char *fmt, va_list args)
+{
+ char *p;
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+
+ if (!fmt || vasprintf(&p, fmt, args) < 0)
+ vverbose(level, file, line, func, fmt, args);
+ else {
+ verbose(level, file, line, func, "[REQ/API %s] %s", xreq->request.called_api, p);
+ free(p);
+ }
+}
+
+static struct afb_stored_req *xreq_legacy_store_cb(struct afb_req_x2 *closure)
+{
+ xreq_addref_cb(closure);
+ return (struct afb_stored_req*)closure;
+}
+
+static int xreq_has_permission_cb(struct afb_req_x2 *closure, const char *permission)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_auth_has_permission(xreq, permission);
+}
+
+static char *xreq_get_application_id_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return xreq->cred && xreq->cred->id ? strdup(xreq->cred->id) : NULL;
+}
+
+static void *xreq_context_make_cb(struct afb_req_x2 *closure, int replace, void *(*create_value)(void*), void (*free_value)(void*), void *create_closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_context_make(&xreq->context, replace, create_value, free_value, create_closure);
+}
+
+static int xreq_get_uid_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return xreq->cred && xreq->cred->id ? (int)xreq->cred->uid : -1;
+}
+
+static struct json_object *xreq_get_client_info_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ struct json_object *r = json_object_new_object();
+ if (xreq->cred && xreq->cred->id) {
+ json_object_object_add(r, "uid", json_object_new_int(xreq->cred->uid));
+ json_object_object_add(r, "gid", json_object_new_int(xreq->cred->gid));
+ json_object_object_add(r, "pid", json_object_new_int(xreq->cred->pid));
+ json_object_object_add(r, "user", json_object_new_string(xreq->cred->user));
+ json_object_object_add(r, "label", json_object_new_string(xreq->cred->label));
+ json_object_object_add(r, "id", json_object_new_string(xreq->cred->id));
+ }
+ if (xreq->context.session) {
+ json_object_object_add(r, "uuid", json_object_new_string(afb_context_uuid(&xreq->context)));
+ json_object_object_add(r, "LOA", json_object_new_int(afb_context_get_loa(&xreq->context)));
+ }
+ return r;
+}
+
+static void xreq_subcall_cb(
+ struct afb_req_x2 *req,
+ const char *api,
+ const char *verb,
+ struct json_object *args,
+ int flags,
+ void (*callback)(void *closure, struct json_object *object, const char *error, const char * info, struct afb_req_x2 *req),
+ void *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ afb_calls_subcall(xreq, api, verb, args, flags, callback, closure);
+}
+
+static int xreq_subcallsync_cb(
+ struct afb_req_x2 *req,
+ const char *api,
+ const char *verb,
+ struct json_object *args,
+ int flags,
+ struct json_object **object,
+ char **error,
+ char **info)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ return afb_calls_subcall_sync(xreq, api, verb, args, flags, object, error, info);
+}
+
+/******************************************************************************/
+
+static struct json_object *xreq_hooked_json_cb(struct afb_req_x2 *closure)
+{
+ struct json_object *r = xreq_json_cb(closure);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_json(xreq, r);
+}
+
+static struct afb_arg xreq_hooked_get_cb(struct afb_req_x2 *closure, const char *name)
+{
+ struct afb_arg r = xreq_get_cb(closure, name);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_get(xreq, name, r);
+}
+
+static void xreq_hooked_reply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *info)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ afb_hook_xreq_reply(xreq, obj, error, info);
+ xreq_reply_cb(closure, obj, error, info);
+}
+
+static void xreq_hooked_vreply_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *error, const char *fmt, va_list args)
+{
+ char *info;
+ if (fmt == NULL || vasprintf(&info, fmt, args) < 0)
+ info = NULL;
+ xreq_hooked_reply_cb(closure, obj, error, info);
+ free(info);
+}
+
+static void xreq_hooked_legacy_success_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *info)
+{
+ xreq_hooked_reply_cb(closure, obj, NULL, info);
+}
+
+static void xreq_hooked_legacy_fail_cb(struct afb_req_x2 *closure, const char *status, const char *info)
+{
+ xreq_hooked_reply_cb(closure, NULL, status, info);
+}
+
+static void xreq_hooked_legacy_vsuccess_cb(struct afb_req_x2 *closure, struct json_object *obj, const char *fmt, va_list args)
+{
+ xreq_hooked_vreply_cb(closure, obj, NULL, fmt, args);
+}
+
+static void xreq_hooked_legacy_vfail_cb(struct afb_req_x2 *closure, const char *status, const char *fmt, va_list args)
+{
+ xreq_hooked_vreply_cb(closure, NULL, status, fmt, args);
+}
+
+static void *xreq_hooked_legacy_context_get_cb(struct afb_req_x2 *closure)
+{
+ void *r = xreq_legacy_context_get_cb(closure);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_legacy_context_get(xreq, r);
+}
+
+static void xreq_hooked_legacy_context_set_cb(struct afb_req_x2 *closure, void *value, void (*free_value)(void*))
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ afb_hook_xreq_legacy_context_set(xreq, value, free_value);
+ xreq_legacy_context_set_cb(closure, value, free_value);
+}
+
+static struct afb_req_x2 *xreq_hooked_addref_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ afb_hook_xreq_addref(xreq);
+ return xreq_addref_cb(closure);
+}
+
+static void xreq_hooked_unref_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ afb_hook_xreq_unref(xreq);
+ xreq_unref_cb(closure);
+}
+
+static void xreq_hooked_session_close_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ afb_hook_xreq_session_close(xreq);
+ xreq_session_close_cb(closure);
+}
+
+static int xreq_hooked_session_set_LOA_cb(struct afb_req_x2 *closure, unsigned level)
+{
+ int r = xreq_session_set_LOA_cb(closure, level);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_session_set_LOA(xreq, level, r);
+}
+
+static int xreq_hooked_subscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
+{
+ int r = xreq_subscribe_event_x2_cb(closure, event);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_subscribe(xreq, event, r);
+}
+
+static int xreq_hooked_legacy_subscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
+{
+ return xreq_hooked_subscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
+}
+
+static int xreq_hooked_unsubscribe_event_x2_cb(struct afb_req_x2 *closure, struct afb_event_x2 *event)
+{
+ int r = xreq_unsubscribe_event_x2_cb(closure, event);
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ return afb_hook_xreq_unsubscribe(xreq, event, r);
+}
+
+static int xreq_hooked_legacy_unsubscribe_event_x1_cb(struct afb_req_x2 *closure, struct afb_event_x1 event)
+{
+ return xreq_hooked_unsubscribe_event_x2_cb(closure, afb_event_x1_to_event_x2(event));
+}
+
+static void xreq_hooked_legacy_subcall_cb(struct afb_req_x2 *req, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*), void *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(req);
+ afb_calls_legacy_hooked_subcall_v1(xreq, api, verb, args, callback, closure);