/*
- * Copyright (C) 2016 "IoT.bzh"
+ * Copyright (C) 2016, 2017 "IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
#include <afb/afb-req-itf.h>
#include <afb/afb-service-itf.h>
-#include "session.h"
+#include "afb-session.h"
#include "afb-context.h"
#include "afb-evt.h"
#include "afb-subcall.h"
struct afb_svc
{
/* session of the service */
- struct AFB_clientCtx *session;
+ struct afb_session *session;
/* event listener of the service or NULL */
struct afb_evt_listener *listener;
};
/* functions for services */
-static void svc_on_event(struct afb_svc *svc, const char *event, struct json_object *object);
+static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object);
static void svc_call(struct afb_svc *svc, const char *api, const char *verb, struct json_object *args,
void (*callback)(void*, int, struct json_object*), void *closure);
.call = (void*)svc_call
};
+/* the interface for events */
+static const struct afb_evt_itf evt_itf = {
+ .broadcast = (void*)svc_on_event,
+ .push = (void*)svc_on_event
+};
+
/* functions for requests of services */
static void svcreq_addref(struct svc_req *svcreq);
static void svcreq_unref(struct svc_req *svcreq);
.subcall = (void*)svcreq_subcall
};
-/* the common session for services sahring their session */
-static struct AFB_clientCtx *common_session;
+/* the common session for services sharing their session */
+static struct afb_session *common_session;
/*
* Creates a new service
if (share_session) {
/* session shared with other svcs */
if (common_session == NULL) {
- common_session = ctxClientCreate (NULL, 0);
+ common_session = afb_session_create (NULL, 0);
if (common_session == NULL)
goto error2;
}
- svc->session = ctxClientAddRef(common_session);
+ svc->session = afb_session_addref(common_session);
} else {
/* session dedicated to the svc */
- svc->session = ctxClientCreate (NULL, 0);
+ 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((void*)svc_on_event, svc);
+ svc->listener = afb_evt_listener_create(&evt_itf, svc);
if (svc->listener == NULL)
goto error3;
}
if (svc->listener != NULL)
afb_evt_listener_unref(svc->listener);
error3:
- ctxClientUnref(svc->session);
+ afb_session_unref(svc->session);
error2:
free(svc);
error:
/*
* Propagates the event to the service
*/
-static void svc_on_event(struct afb_svc *svc, const char *event, struct json_object *object)
+static void svc_on_event(struct afb_svc *svc, const char *event, int eventid, struct json_object *object)
{
svc->on_event(event, object);
+ json_object_put(object);
}
/*