#include "afb-msg-json.h"
#include "afb-svc.h"
#include "afb-xreq.h"
-#include "afb-apis.h"
+#include "afb-cred.h"
+#include "afb-apiset.h"
#include "verbose.h"
/*
/* session of the service */
struct afb_session *session;
+ /* the apiset for the service */
+ struct afb_apiset *apiset;
+
/* event listener of the service or NULL */
struct afb_evt_listener *listener;
/*
* Allocates a new service
*/
-static struct afb_svc *afb_svc_alloc(int share_session, void (*on_event)(const char *event, struct json_object *object))
+static struct afb_svc *afb_svc_alloc(
+ struct afb_apiset *apiset,
+ int share_session,
+ void (*on_event)(const char *event, struct json_object *object)
+)
{
struct afb_svc *svc;
if (svc == NULL)
goto error;
+ /* instanciate the apiset */
+ svc->apiset = afb_apiset_addref(apiset);
+
/* instanciate the session */
if (share_session) {
/* session shared with other svcs */
error3:
afb_session_unref(svc->session);
error2:
+ afb_apiset_unref(svc->apiset);
free(svc);
error:
return NULL;
/*
* Creates a new service
*/
-struct afb_svc *afb_svc_create(int share_session, int (*init)(struct afb_service service), void (*on_event)(const char *event, struct json_object *object))
+struct afb_svc *afb_svc_create(
+ struct afb_apiset *apiset,
+ int share_session,
+ int (*init)(struct afb_service service),
+ void (*on_event)(const char *event, struct json_object *object)
+)
{
int rc;
struct afb_svc *svc;
/* allocates the svc handler */
- svc = afb_svc_alloc(share_session, on_event);
+ svc = afb_svc_alloc(apiset, share_session, on_event);
if (svc == NULL)
goto error;
if (svc->listener != NULL)
afb_evt_listener_unref(svc->listener);
afb_session_unref(svc->session);
+ afb_apiset_unref(svc->apiset);
free(svc);
error:
return NULL;
* Creates a new service
*/
struct afb_svc *afb_svc_create_v2(
+ struct afb_apiset *apiset,
int share_session,
void (*on_event)(const char *event, struct json_object *object),
int (*start)(const struct afb_binding_interface *interface, struct afb_service service),
- const struct afb_binding_interface *interface)
+ const struct afb_binding_interface *interface
+)
{
int rc;
struct afb_svc *svc;
/* allocates the svc handler */
- svc = afb_svc_alloc(share_session, on_event);
+ svc = afb_svc_alloc(apiset, share_session, on_event);
if (svc == NULL)
goto error;
if (svc->listener != NULL)
afb_evt_listener_unref(svc->listener);
afb_session_unref(svc->session);
+ afb_apiset_unref(svc->apiset);
free(svc);
error:
return NULL;
afb_xreq_init(&svcreq->xreq, &afb_svc_xreq_itf);
afb_context_init(&svcreq->xreq.context, svc->session, NULL);
svcreq->xreq.context.validated = 1;
+ svcreq->xreq.cred = afb_cred_current();
svcreq->xreq.api = api;
svcreq->xreq.verb = verb;
svcreq->xreq.listener = svc->listener;
svcreq->closure = cbclosure;
/* terminates and frees ressources if needed */
- afb_apis_call(&svcreq->xreq);
- afb_xreq_unref(&svcreq->xreq);
+ afb_xreq_process(&svcreq->xreq, svc->apiset);
}
static void svcreq_destroy(struct afb_xreq *xreq)
struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
afb_context_disconnect(&svcreq->xreq.context);
json_object_put(svcreq->xreq.json);
+ afb_cred_unref(svcreq->xreq.cred);
free(svcreq);
}