+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ va_list ap;
+ va_copy(ap, args);
+ xreq_vverbose_cb(closure, level, file, line, func, fmt, args);
+ afb_hook_xreq_vverbose(xreq, level, file, line, func, fmt, ap);
+ va_end(ap);
+}
+
+static struct afb_stored_req *xreq_hooked_legacy_store_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ struct afb_stored_req *r = xreq_legacy_store_cb(closure);
+ afb_hook_xreq_legacy_store(xreq, r);
+ return r;
+}
+
+static int xreq_hooked_has_permission_cb(struct afb_req_x2 *closure, const char *permission)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ int r = xreq_has_permission_cb(closure, permission);
+ return afb_hook_xreq_has_permission(xreq, permission, r);
+}
+
+static char *xreq_hooked_get_application_id_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ char *r = xreq_get_application_id_cb(closure);
+ return afb_hook_xreq_get_application_id(xreq, r);
+}
+
+static void *xreq_hooked_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);
+ void *result = xreq_context_make_cb(closure, replace, create_value, free_value, create_closure);
+ return afb_hook_xreq_context_make(xreq, replace, create_value, free_value, create_closure, result);
+}
+
+static int xreq_hooked_get_uid_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ int r = xreq_get_uid_cb(closure);
+ return afb_hook_xreq_get_uid(xreq, r);
+}
+
+static struct json_object *xreq_hooked_get_client_info_cb(struct afb_req_x2 *closure)
+{
+ struct afb_xreq *xreq = xreq_from_req_x2(closure);
+ struct json_object *r = xreq_get_client_info_cb(closure);
+ return afb_hook_xreq_get_client_info(xreq, r);
+}
+
+static void xreq_hooked_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_hooked_subcall(xreq, api, verb, args, flags, callback, closure);
+}
+
+static int xreq_hooked_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_hooked_subcall_sync(xreq, api, verb, args, flags, object, error, info);
+}
+
+/******************************************************************************/
+
+const struct afb_req_x2_itf xreq_hooked_itf = {
+ .json = xreq_hooked_json_cb,
+ .get = xreq_hooked_get_cb,
+ .legacy_success = xreq_hooked_legacy_success_cb,
+ .legacy_fail = xreq_hooked_legacy_fail_cb,
+ .legacy_vsuccess = xreq_hooked_legacy_vsuccess_cb,
+ .legacy_vfail = xreq_hooked_legacy_vfail_cb,
+ .legacy_context_get = xreq_hooked_legacy_context_get_cb,
+ .legacy_context_set = xreq_hooked_legacy_context_set_cb,
+ .addref = xreq_hooked_addref_cb,
+ .unref = xreq_hooked_unref_cb,
+ .session_close = xreq_hooked_session_close_cb,
+ .session_set_LOA = xreq_hooked_session_set_LOA_cb,
+ .legacy_subscribe_event_x1 = xreq_hooked_legacy_subscribe_event_x1_cb,
+ .legacy_unsubscribe_event_x1 = xreq_hooked_legacy_unsubscribe_event_x1_cb,
+ .legacy_subcall = xreq_hooked_legacy_subcall_cb,
+ .legacy_subcallsync = xreq_hooked_legacy_subcallsync_cb,
+ .vverbose = xreq_hooked_vverbose_cb,
+ .legacy_store_req = xreq_hooked_legacy_store_cb,
+ .legacy_subcall_req = xreq_hooked_legacy_subcall_req_cb,
+ .has_permission = xreq_hooked_has_permission_cb,
+ .get_application_id = xreq_hooked_get_application_id_cb,
+ .context_make = xreq_hooked_context_make_cb,
+ .subscribe_event_x2 = xreq_hooked_subscribe_event_x2_cb,
+ .unsubscribe_event_x2 = xreq_hooked_unsubscribe_event_x2_cb,
+ .legacy_subcall_request = xreq_hooked_legacy_subcall_request_cb,
+ .get_uid = xreq_hooked_get_uid_cb,
+ .reply = xreq_hooked_reply_cb,
+ .vreply = xreq_hooked_vreply_cb,
+ .get_client_info = xreq_hooked_get_client_info_cb,
+ .subcall = xreq_hooked_subcall_cb,
+ .subcallsync = xreq_hooked_subcallsync_cb,
+};
+#endif
+
+/******************************************************************************/
+
+struct afb_req_x1 afb_xreq_unstore(struct afb_stored_req *sreq)
+{
+ struct afb_xreq *xreq = (struct afb_xreq *)sreq;
+#if WITH_AFB_HOOK
+ if (xreq->hookflags)
+ afb_hook_xreq_legacy_unstore(xreq);
+#endif
+ return xreq_to_req_x1(xreq);
+}
+
+struct json_object *afb_xreq_json(struct afb_xreq *xreq)
+{
+ return afb_req_x2_json(xreq_to_req_x2(xreq));
+}
+
+void afb_xreq_reply(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info)
+{
+ afb_req_x2_reply(xreq_to_req_x2(xreq), obj, error, info);
+}
+
+void afb_xreq_reply_f(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info, ...)
+{
+ va_list args;
+
+ va_start(args, info);
+ afb_req_x2_reply_v(xreq_to_req_x2(xreq), obj, error, info, args);
+ va_end(args);
+}
+
+const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size)
+{
+ struct json_object *obj = xreq_json_cb(xreq_to_req_x2(xreq));
+ const char *result = json_object_to_json_string_ext(obj, JSON_C_TO_STRING_NOSLASHESCAPE);
+ if (size != NULL)
+ *size = strlen(result);
+ return result;
+}
+
+void afb_xreq_unhooked_legacy_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *cb_closure)
+{
+ xreq_legacy_subcall_request_cb(xreq_to_req_x2(xreq), api, verb, args, callback, cb_closure);
+}
+
+void afb_xreq_unhooked_subcall(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, int flags, void (*callback)(void*, struct json_object*, const char*, const char*, struct afb_req_x2 *), void *closure)
+{
+ xreq_subcall_cb(xreq_to_req_x2(xreq), api, verb, args, flags, callback, closure);
+}
+
+int afb_xreq_unhooked_legacy_subcall_sync(struct afb_xreq *xreq, const char *api, const char *verb, struct json_object *args, struct json_object **result)
+{
+ return xreq_legacy_subcallsync_cb(xreq_to_req_x2(xreq), api, verb, args, result);
+}
+
+void afb_xreq_addref(struct afb_xreq *xreq)
+{
+ afb_req_x2_addref(xreq_to_req_x2(xreq));