diff options
Diffstat (limited to 'src/afb-xreq.h')
| -rw-r--r-- | src/afb-xreq.h | 89 |
1 files changed, 49 insertions, 40 deletions
diff --git a/src/afb-xreq.h b/src/afb-xreq.h index ae1419fb..5c748d6f 100644 --- a/src/afb-xreq.h +++ b/src/afb-xreq.h @@ -17,8 +17,9 @@ #pragma once -#include <afb/afb-request-itf.h> -#include <afb/afb-req-itf.h> +#include <stdarg.h> +#include <afb/afb-req-x1-itf.h> +#include <afb/afb-req-x2-itf.h> #include "afb-context.h" struct json_object; @@ -26,29 +27,20 @@ struct afb_evt_listener; struct afb_xreq; struct afb_cred; struct afb_apiset; -struct afb_api_dyn_verb; -struct afb_eventid; +struct afb_event_x2; struct afb_verb_desc_v1; struct afb_verb_v2; -struct afb_req; +struct afb_verb_v3; +struct afb_req_x1; struct afb_stored_req; struct afb_xreq_query_itf { struct json_object *(*json)(struct afb_xreq *xreq); struct afb_arg (*get)(struct afb_xreq *xreq, const char *name); - void (*success)(struct afb_xreq *xreq, struct json_object *obj, const char *info); - void (*fail)(struct afb_xreq *xreq, const char *status, const char *info); - void (*reply)(struct afb_xreq *xreq, int status, struct json_object *obj); + void (*reply)(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info); void (*unref)(struct afb_xreq *xreq); - int (*subscribe)(struct afb_xreq *xreq, struct afb_eventid *eventid); - int (*unsubscribe)(struct afb_xreq *xreq, struct afb_eventid *eventid); - void (*subcall)( - struct afb_xreq *xreq, - const char *api, - const char *verb, - struct json_object *args, - void (*callback)(void*, int, struct json_object*), - void *cb_closure); + int (*subscribe)(struct afb_xreq *xreq, struct afb_event_x2 *event); + int (*unsubscribe)(struct afb_xreq *xreq, struct afb_event_x2 *event); }; /** @@ -56,7 +48,7 @@ struct afb_xreq_query_itf { */ struct afb_xreq { - struct afb_request request; /**< exported request */ + struct afb_req_x2 request; /**< exported request */ struct afb_context context; /**< context of the request */ struct afb_apiset *apiset; /**< apiset of the xreq */ struct json_object *json; /**< the json object (or NULL) */ @@ -90,49 +82,65 @@ struct afb_xreq #define CONTAINER_OF_XREQ(type,x) CONTAINER_OF(type,xreq,x) /* req wrappers for xreq */ -extern struct afb_req afb_xreq_unstore(struct afb_stored_req *sreq); +extern struct afb_req_x1 afb_xreq_unstore(struct afb_stored_req *sreq); extern void afb_xreq_addref(struct afb_xreq *xreq); extern void afb_xreq_unref(struct afb_xreq *xreq); extern void afb_xreq_unhooked_addref(struct afb_xreq *xreq); extern void afb_xreq_unhooked_unref(struct afb_xreq *xreq); +extern struct json_object *afb_xreq_unhooked_json(struct afb_xreq *xreq); extern struct json_object *afb_xreq_json(struct afb_xreq *xreq); -extern void afb_xreq_success(struct afb_xreq *xreq, struct json_object *obj, const char *info); -extern void afb_xreq_success_f(struct afb_xreq *xreq, struct json_object *obj, const char *info, ...); +extern void afb_xreq_reply(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info); +extern void afb_xreq_reply_f(struct afb_xreq *xreq, struct json_object *obj, const char *error, const char *info, ...); -extern void afb_xreq_fail(struct afb_xreq *xreq, const char *status, const char *info); -extern void afb_xreq_fail_f(struct afb_xreq *xreq, const char *status, const char *info, ...); -extern void afb_xreq_fail_unknown_api(struct afb_xreq *xreq); -extern void afb_xreq_fail_unknown_verb(struct afb_xreq *xreq); +extern void afb_xreq_reply_unknown_api(struct afb_xreq *xreq); +extern void afb_xreq_reply_unknown_verb(struct afb_xreq *xreq); extern const char *afb_xreq_raw(struct afb_xreq *xreq, size_t *size); -extern int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_eventid *eventid); -extern int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_eventid *eventid); +extern int afb_xreq_subscribe(struct afb_xreq *xreq, struct afb_event_x2 *event); +extern int afb_xreq_unsubscribe(struct afb_xreq *xreq, struct afb_event_x2 *event); -extern void afb_xreq_subcall( +extern void afb_xreq_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_request *), + void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *cb_closure); -extern void afb_xreq_unhooked_subcall( +extern 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_request *), + void (*callback)(void*, int, struct json_object*, struct afb_req_x2 *), void *cb_closure); -extern int afb_xreq_unhooked_subcall_sync( +extern void afb_xreq_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); +extern 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); + +extern 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); -extern int afb_xreq_subcall_sync( +extern int afb_xreq_legacy_subcall_sync( struct afb_xreq *xreq, const char *api, const char *verb, @@ -146,23 +154,24 @@ extern void afb_xreq_process(struct afb_xreq *xreq, struct afb_apiset *apiset); extern void afb_xreq_call_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb); extern void afb_xreq_call_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb); -extern void afb_xreq_call_verb_vdyn(struct afb_xreq *xreq, const struct afb_api_dyn_verb *verb); +extern void afb_xreq_call_verb_v3(struct afb_xreq *xreq, const struct afb_verb_v3 *verb); + +extern const char *xreq_on_behalf_cred_export(struct afb_xreq *xreq); /******************************************************************************/ -static inline struct afb_req xreq_to_req(struct afb_xreq *xreq) +static inline struct afb_req_x1 xreq_to_req_x1(struct afb_xreq *xreq) { - return (struct afb_req){ .itf = xreq->request.itf, .closure = &xreq->request }; + return (struct afb_req_x1){ .itf = xreq->request.itf, .closure = &xreq->request }; } -static inline struct afb_request *xreq_to_request(struct afb_xreq *xreq) +static inline struct afb_req_x2 *xreq_to_req_x2(struct afb_xreq *xreq) { return &xreq->request; } -static inline struct afb_xreq *xreq_from_request(struct afb_request *request) +static inline struct afb_xreq *xreq_from_req_x2(struct afb_req_x2 *req) { - return CONTAINER_OF(struct afb_xreq, request, request); + return CONTAINER_OF(struct afb_xreq, request, req); } - |