#define _GNU_SOURCE
#include <stdlib.h>
+#include <errno.h>
#include <json-c/json.h>
#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 "afb-ditf.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;
/* on event callback for the service */
- void (*on_event)(const char *event, struct json_object *object);
+ union {
+ void (*on_event_v1)(const char *event, struct json_object *object);
+ void (*on_event_v2)(struct afb_service service, const char *event, struct json_object *object);
+ };
+
+ /* the daemon interface */
+ struct afb_ditf *ditf;
};
/*
struct afb_xreq xreq;
/* the args */
- struct json_object *args;
void (*callback)(void*, int, struct json_object*);
void *closure;
-
- /* the service */
- struct afb_svc *svc;
};
/* functions for services */
-static void svc_on_event(void *closure, const char *event, int eventid, struct json_object *object);
+static void svc_on_event_v1(void *closure, const char *event, int eventid, struct json_object *object);
+static void svc_on_event_v2(void *closure, const char *event, int eventid, struct json_object *object);
static void svc_call(void *closure, const char *api, const char *verb, struct json_object *args,
void (*callback)(void*, int, struct json_object*), void *cbclosure);
};
/* the interface for events */
-static const struct afb_evt_itf evt_itf = {
- .broadcast = svc_on_event,
- .push = svc_on_event
+static const struct afb_evt_itf evt_itf_v1 = {
+ .broadcast = svc_on_event_v1,
+ .push = svc_on_event_v1
+};
+static const struct afb_evt_itf evt_itf_v2 = {
+ .broadcast = svc_on_event_v2,
+ .push = svc_on_event_v2
};
/* functions for requests of services */
-static struct json_object *svcreq_json(void *closure);
-static void svcreq_destroy(void *closure);
-static void svcreq_reply(void *closure, int iserror, json_object *obj);
+static void svcreq_destroy(struct afb_xreq *xreq);
+static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj);
/* interface for requests of services */
const struct afb_xreq_query_itf afb_svc_xreq_itf = {
.unref = svcreq_destroy,
- .json = svcreq_json,
.reply = svcreq_reply
};
/* the common session for services sharing their session */
static struct afb_session *common_session;
+static inline struct afb_service to_afb_service_v1(struct afb_svc *svc)
+{
+ return (struct afb_service){ .itf = &service_itf, .closure = svc };
+}
+
+static inline struct afb_service to_afb_service_v2(struct afb_svc *svc)
+{
+ return (struct afb_service){ .itf = &service_itf, .closure = svc };
+}
+
+/*
+ * Frees a service
+ */
+static void svc_free(struct afb_svc *svc)
+{
+ if (svc->listener != NULL)
+ afb_evt_listener_unref(svc->listener);
+ if (svc->session)
+ afb_session_unref(svc->session);
+ afb_apiset_unref(svc->apiset);
+ free(svc);
+}
+
/*
* 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
+)
{
struct afb_svc *svc;
/* allocates the svc handler */
- svc = malloc(sizeof * svc);
- if (svc == NULL)
- goto error;
+ svc = calloc(1, sizeof * svc);
+ if (svc == NULL) {
+ errno = ENOMEM;
+ return NULL;
+ }
+
+ /* instanciate the apiset */
+ svc->apiset = afb_apiset_addref(apiset);
/* instanciate the session */
if (share_session) {
if (common_session == NULL) {
common_session = afb_session_create (NULL, 0);
if (common_session == NULL)
- goto error2;
+ goto error;
}
svc->session = afb_session_addref(common_session);
} else {
/* session dedicated to the svc */
svc->session = afb_session_create (NULL, 0);
if (svc->session == NULL)
- goto error2;
- }
-
- /* initialises the listener if needed */
- svc->on_event = on_event;
- if (on_event == NULL)
- svc->listener = NULL;
- else {
- svc->listener = afb_evt_listener_create(&evt_itf, svc);
- if (svc->listener == NULL)
- goto error3;
+ goto error;
}
return svc;
-error3:
- afb_session_unref(svc->session);
-error2:
- free(svc);
error:
+ svc_free(svc);
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_v1(
+ struct afb_apiset *apiset,
+ int share_session,
+ int (*start)(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);
if (svc == NULL)
goto error;
+ /* initialises the listener if needed */
+ if (on_event) {
+ svc->on_event_v1 = on_event;
+ svc->listener = afb_evt_listener_create(&evt_itf_v1, svc);
+ if (svc->listener == NULL)
+ goto error;
+ }
+
/* initialises the svc now */
- rc = init((struct afb_service){ .itf = &service_itf, .closure = svc });
+ rc = start(to_afb_service_v1(svc));
if (rc < 0)
- goto error2;
+ goto error;
return svc;
-error2:
- if (svc->listener != NULL)
- afb_evt_listener_unref(svc->listener);
- afb_session_unref(svc->session);
- free(svc);
error:
+ svc_free(svc);
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)
+ int (*start)(struct afb_service service),
+ void (*on_event)(struct afb_service service, const char *event, struct json_object *object),
+ struct afb_ditf *ditf
+)
{
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);
if (svc == NULL)
goto error;
+ svc->ditf = ditf;
+
+ /* initialises the listener if needed */
+ if (on_event) {
+ svc->on_event_v2 = on_event;
+ svc->listener = afb_evt_listener_create(&evt_itf_v2, svc);
+ if (svc->listener == NULL)
+ goto error;
+ }
/* initialises the svc now */
- rc = start(interface, (struct afb_service){ .itf = &service_itf, .closure = svc });
+ rc = start(to_afb_service_v2(svc));
if (rc < 0)
- goto error2;
+ goto error;
return svc;
-error2:
- if (svc->listener != NULL)
- afb_evt_listener_unref(svc->listener);
- afb_session_unref(svc->session);
- free(svc);
error:
+ svc_free(svc);
return NULL;
}
/*
* Propagates the event to the service
*/
-static void svc_on_event(void *closure, const char *event, int eventid, struct json_object *object)
+static void svc_on_event_v1(void *closure, const char *event, int eventid, struct json_object *object)
{
struct afb_svc *svc = closure;
- svc->on_event(event, object);
+ svc->on_event_v1(event, object);
+ json_object_put(object);
+}
+
+/*
+ * Propagates the event to the service
+ */
+static void svc_on_event_v2(void *closure, const char *event, int eventid, struct json_object *object)
+{
+ struct afb_svc *svc = closure;
+ svc->on_event_v2(to_afb_service_v2(svc), event, object);
json_object_put(object);
}
}
/* initialises the request */
+ 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.refcount = 1;
- svcreq->xreq.query = svcreq;
- svcreq->xreq.queryitf = &afb_svc_xreq_itf;
+ svcreq->xreq.cred = afb_cred_current();
svcreq->xreq.api = api;
svcreq->xreq.verb = verb;
svcreq->xreq.listener = svc->listener;
- svcreq->args = args;
+ svcreq->xreq.json = args;
svcreq->callback = callback;
svcreq->closure = cbclosure;
- svcreq->svc = svc;
/* 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(void *closure)
+static void svcreq_destroy(struct afb_xreq *xreq)
{
- struct svc_req *svcreq = closure;
+ struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
afb_context_disconnect(&svcreq->xreq.context);
- json_object_put(svcreq->args);
+ json_object_put(svcreq->xreq.json);
+ afb_cred_unref(svcreq->xreq.cred);
free(svcreq);
}
-static struct json_object *svcreq_json(void *closure)
-{
- struct svc_req *svcreq = closure;
- return svcreq->args;
-}
-
-static void svcreq_reply(void *closure, int iserror, json_object *obj)
+static void svcreq_reply(struct afb_xreq *xreq, int iserror, json_object *obj)
{
- struct svc_req *svcreq = closure;
+ struct svc_req *svcreq = CONTAINER_OF_XREQ(struct svc_req, xreq);
svcreq->callback(svcreq->closure, iserror, obj);
json_object_put(obj);
}