#include "afb-request-itf.h"
-typedef struct afb_request afb_request;
-
-#include "afb-event.h"
-
/*
* Gets from the request 'request' the argument of 'name'.
* Returns a PLAIN structure of type 'struct afb_arg'.
* to the 'event'.
* Returns 0 in case of successful subscription or -1 in case of error.
*/
-static inline int afb_request_subscribe(struct afb_request *request, struct afb_event event)
+static inline int afb_request_subscribe(struct afb_request *request, struct afb_eventid *eventid)
{
- return request->itf->subscribe(request, event);
+ return request->itf->subscribe_eventid(request, eventid);
}
/*
* link identified by 'request'.
* Returns 0 in case of successful subscription or -1 in case of error.
*/
-static inline int afb_request_unsubscribe(struct afb_request *request, struct afb_event event)
+static inline int afb_request_unsubscribe(struct afb_request *request, struct afb_eventid *eventid)
{
- return request->itf->unsubscribe(request, event);
+ return request->itf->unsubscribe_eventid(request, eventid);
}
/*
* - 'afb_request_subcall_req' that is convenient to keep request alive automatically.
* - 'afb_request_subcall_sync' the synchronous version
*/
-static inline void afb_request_subcall(struct afb_request *request, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result), void *closure)
+static inline void afb_request_subcall(struct afb_request *request, const char *api, const char *verb, struct json_object *args, void (*callback)(void *closure, int iserror, struct json_object *result, struct afb_request *request), void *closure)
{
- request->itf->subcall(request, api, verb, args, callback, closure);
+ request->itf->subcall_request(request, api, verb, args, callback, closure);
}
/*