#define _GNU_SOURCE
#include <stdlib.h>
+#include <errno.h>
#include <json-c/json.h>
-#include <afb/afb-req-itf.h>
-#include <afb/afb-service-itf.h>
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
#include "afb-session.h"
#include "afb-context.h"
/* on event callback for the service */
void (*on_event)(const char *event, struct json_object *object);
+
+ struct afb_binding_data_v2 *v2;
};
/*
/* 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(
struct afb_apiset *apiset,
- int share_session,
- void (*on_event)(const char *event, struct json_object *object)
+ 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);
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:
- afb_apiset_unref(svc->apiset);
- free(svc);
error:
+ svc_free(svc);
return NULL;
}
/*
* Creates a new service
*/
-struct afb_svc *afb_svc_create(
+struct afb_svc *afb_svc_create_v1(
struct afb_apiset *apiset,
int share_session,
- int (*init)(struct afb_service service),
+ int (*start)(struct afb_service service),
void (*on_event)(const char *event, struct json_object *object)
)
{
struct afb_svc *svc;
/* allocates the svc handler */
- svc = afb_svc_alloc(apiset, 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 = on_event;
+ svc->listener = afb_evt_listener_create(&evt_itf, 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);
- afb_apiset_unref(svc->apiset);
- free(svc);
error:
+ svc_free(svc);
return NULL;
}
struct afb_svc *afb_svc_create_v2(
struct afb_apiset *apiset,
int share_session,
+ int (*start)(),
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
+ struct afb_binding_data_v2 *data
)
{
int rc;
struct afb_svc *svc;
/* allocates the svc handler */
- svc = afb_svc_alloc(apiset, share_session, on_event);
+ svc = afb_svc_alloc(apiset, share_session);
if (svc == NULL)
goto error;
+ svc->v2 = data;
+ data->service = to_afb_service_v2(svc);
- /* initialises the svc now */
- rc = start(interface, (struct afb_service){ .itf = &service_itf, .closure = svc });
- if (rc < 0)
- goto error2;
+ /* initialises the listener if needed */
+ if (on_event) {
+ svc->on_event = on_event;
+ svc->listener = afb_evt_listener_create(&evt_itf, svc);
+ if (svc->listener == NULL)
+ goto error;
+ }
+
+ /* starts the svc if needed */
+ if (start) {
+ rc = start();
+ if (rc < 0)
+ goto error;
+ }
return svc;
-error2:
- if (svc->listener != NULL)
- afb_evt_listener_unref(svc->listener);
- afb_session_unref(svc->session);
- afb_apiset_unref(svc->apiset);
- free(svc);
error:
+ svc_free(svc);
return NULL;
}