const struct afb_binding *afbBindingV1Register (const struct afb_binding_interface *itf)
{
interface = itf;
+ NOTICE(interface, "hello plugin comes to live");
return &plugin_desc;
}
afb-common.c
afb-config.c
afb-context.c
+ afb-ditf.c
afb-evt.c
afb-hook.c
afb-hreq.c
#include "afb-context.h"
#include "afb-api-so.h"
#include "afb-xreq.h"
+#include "afb-ditf.h"
#include "verbose.h"
/*
*/
struct api_so_v1 {
struct afb_binding *binding; /* descriptor */
- size_t apilength; /* length of the API name */
void *handle; /* context of dlopen */
struct afb_svc *service; /* handler for service started */
- struct afb_binding_interface interface; /* interface for the binding */
+ struct afb_ditf ditf; /* daemon interface */
};
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name);
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object);
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args);
-static int afb_api_so_rootdir_get_fd(void *closure);
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale);
-
-static const struct afb_daemon_itf daemon_itf = {
- .event_broadcast = afb_api_so_event_broadcast_cb,
- .get_event_loop = afb_common_get_event_loop,
- .get_user_bus = afb_common_get_user_bus,
- .get_system_bus = afb_common_get_system_bus,
- .vverbose = afb_api_so_vverbose_cb,
- .event_make = afb_api_so_event_make_cb,
- .rootdir_get_fd = afb_api_so_rootdir_get_fd,
- .rootdir_open_locale = afb_api_so_rootdir_open_locale
-};
-
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name)
-{
- size_t length;
- char *event;
- struct api_so_v1 *desc = closure;
-
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->v1.prefix, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
-
- /* crate the event */
- return afb_evt_create_event(event);
-}
-
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object)
-{
- size_t length;
- char *event;
- struct api_so_v1 *desc = closure;
-
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->v1.prefix, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
-
- return afb_evt_broadcast(event, object);
-}
-
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
-{
- char *p;
- struct api_so_v1 *desc = closure;
-
- if (vasprintf(&p, fmt, args) < 0)
- vverbose(level, file, line, fmt, args);
- else {
- verbose(level, file, line, "%s {binding %s}", p, desc->binding->v1.prefix);
- free(p);
- }
-}
-
-static int afb_api_so_rootdir_get_fd(void *closure)
-{
- return afb_common_rootdir_get_fd();
-}
-
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale)
-{
- return afb_common_rootdir_open_locale(filename, flags, locale);
-}
-
static const struct afb_verb_desc_v1 *search(struct api_so_v1 *desc, const char *name)
{
const struct afb_verb_desc_v1 *verb;
{
struct api_so_v1 *desc;
struct afb_binding *(*register_function) (const struct afb_binding_interface *interface);
- struct afb_verb_desc_v1 fake_verb;
- struct afb_binding fake_binding;
/* retrieves the register function */
register_function = dlsym(handle, afb_api_so_v1_register);
desc->handle = handle;
/* init the interface */
- desc->interface.verbosity = verbosity;
- desc->interface.mode = AFB_MODE_LOCAL;
- desc->interface.daemon.itf = &daemon_itf;
- desc->interface.daemon.closure = desc;
-
- /* for log purpose, a fake binding is needed here */
- desc->binding = &fake_binding;
- fake_binding.type = AFB_BINDING_VERSION_1;
- fake_binding.v1.info = path;
- fake_binding.v1.prefix = path;
- fake_binding.v1.verbs = &fake_verb;
- fake_verb.name = NULL;
+ afb_ditf_init(&desc->ditf, path);
/* init the binding */
NOTICE("binding [%s] calling registering function %s", path, afb_api_so_v1_register);
- desc->binding = register_function(&desc->interface);
+ desc->binding = register_function(&desc->ditf.interface);
if (desc->binding == NULL) {
ERROR("binding [%s] register function failed. continuing...", path);
goto error2;
}
/* records the binding */
- desc->apilength = strlen(desc->binding->v1.prefix);
+ afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
if (afb_apis_add(desc->binding->v1.prefix, (struct afb_api){
.closure = desc,
.call = call_cb,
#include "afb-apis.h"
#include "afb-svc.h"
+#include "afb-ditf.h"
#include "afb-evt.h"
#include "afb-common.h"
#include "afb-context.h"
*/
struct api_so_v2 {
struct afb_binding_v2 *binding; /* descriptor */
- size_t apilength; /* length of the API name */
void *handle; /* context of dlopen */
struct afb_svc *service; /* handler for service started */
- struct afb_binding_interface interface; /* interface for the binding */
+ struct afb_ditf ditf; /* daemon interface */
};
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name);
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object);
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args);
-static int afb_api_so_rootdir_get_fd(void *closure);
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale);
-
-static const struct afb_daemon_itf daemon_itf = {
- .event_broadcast = afb_api_so_event_broadcast_cb,
- .get_event_loop = afb_common_get_event_loop,
- .get_user_bus = afb_common_get_user_bus,
- .get_system_bus = afb_common_get_system_bus,
- .vverbose = afb_api_so_vverbose_cb,
- .event_make = afb_api_so_event_make_cb,
- .rootdir_get_fd = afb_api_so_rootdir_get_fd,
- .rootdir_open_locale = afb_api_so_rootdir_open_locale
-};
-
-static struct afb_event afb_api_so_event_make_cb(void *closure, const char *name)
-{
- size_t length;
- char *event;
- struct api_so_v2 *desc = closure;
-
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->api, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
-
- /* crate the event */
- return afb_evt_create_event(event);
-}
-
-static int afb_api_so_event_broadcast_cb(void *closure, const char *name, struct json_object *object)
-{
- size_t length;
- char *event;
- struct api_so_v2 *desc = closure;
-
- /* makes the event name */
- assert(desc->binding != NULL);
- length = strlen(name);
- event = alloca(length + 2 + desc->apilength);
- memcpy(event, desc->binding->api, desc->apilength);
- event[desc->apilength] = '/';
- memcpy(event + desc->apilength + 1, name, length + 1);
-
- return afb_evt_broadcast(event, object);
-}
-
-static void afb_api_so_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
-{
- char *p;
- struct api_so_v2 *desc = closure;
-
- if (vasprintf(&p, fmt, args) < 0)
- vverbose(level, file, line, fmt, args);
- else {
- verbose(level, file, line, "%s {binding %s}", p, desc->binding->api);
- free(p);
- }
-}
-
-static int afb_api_so_rootdir_get_fd(void *closure)
-{
- return afb_common_rootdir_get_fd();
-}
-
-static int afb_api_so_rootdir_open_locale(void *closure, const char *filename, int flags, const char *locale)
-{
- return afb_common_rootdir_open_locale(filename, flags, locale);
-}
-
static const struct afb_verb_v2 *search(struct api_so_v2 *desc, const char *verb)
{
const struct afb_verb_v2 *result;
/* get the event handler if any */
onevent = desc->binding->onevent;
- desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->interface);
+ desc->service = afb_svc_create_v2(share_session, onevent, start, &desc->ditf.interface);
if (desc->service == NULL) {
/* starting error */
ERROR("Starting service %s failed", desc->binding->api);
desc->handle = handle;
/* init the interface */
- desc->interface.verbosity = verbosity;
- desc->interface.mode = AFB_MODE_LOCAL;
- desc->interface.daemon.itf = &daemon_itf;
- desc->interface.daemon.closure = desc;
+ afb_ditf_init(&desc->ditf, binding->api);
/* for log purpose, a fake binding is needed here */
/* init the binding */
if (binding->init) {
NOTICE("binding %s [%s] calling init function", binding->api, path);
- rc = binding->init(&desc->interface);
+ rc = binding->init(&desc->ditf.interface);
if (rc < 0) {
ERROR("binding %s [%s] initialisation function failed...", binding->api, path);
goto error2;
}
/* records the binding */
- desc->apilength = strlen(binding->api);
if (afb_apis_add(binding->api, (struct afb_api){
.closure = desc,
.call = call_cb,
--- /dev/null
+/*
+ * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Author José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _GNU_SOURCE
+#define NO_BINDING_VERBOSE_MACRO
+
+#include <string.h>
+#include <errno.h>
+
+#include <afb/afb-binding.h>
+
+#include "afb-ditf.h"
+#include "afb-evt.h"
+#include "afb-common.h"
+#include "verbose.h"
+
+
+static struct afb_event event_make_cb(void *closure, const char *name);
+static int event_broadcast_cb(void *closure, const char *name, struct json_object *object);
+static void vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args);
+static int rootdir_open_locale_cb(void *closure, const char *filename, int flags, const char *locale);
+
+static const struct afb_daemon_itf daemon_itf = {
+ .vverbose = vverbose_cb,
+ .event_make = event_make_cb,
+ .event_broadcast = event_broadcast_cb,
+ .get_event_loop = afb_common_get_event_loop,
+ .get_user_bus = afb_common_get_user_bus,
+ .get_system_bus = afb_common_get_system_bus,
+ .rootdir_get_fd = afb_common_rootdir_get_fd,
+ .rootdir_open_locale = rootdir_open_locale_cb
+};
+
+static void vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
+{
+ char *p;
+ struct afb_ditf *ditf = closure;
+
+ if (vasprintf(&p, fmt, args) < 0)
+ vverbose(level, file, line, fmt, args);
+ else {
+ verbose(level, file, line, "%s {binding %s}", p, ditf->prefix);
+ free(p);
+ }
+}
+
+static struct afb_event event_make_cb(void *closure, const char *name)
+{
+ size_t plen, nlen;
+ char *event;
+ struct afb_ditf *ditf = closure;
+
+ /* makes the event name */
+ plen = strlen(ditf->prefix);
+ nlen = strlen(name);
+ event = alloca(nlen + plen + 2);
+ memcpy(event, ditf->prefix, plen);
+ event[plen] = '/';
+ memcpy(event + plen + 1, name, nlen + 1);
+
+ /* create the event */
+ return afb_evt_create_event(event);
+}
+
+static int event_broadcast_cb(void *closure, const char *name, struct json_object *object)
+{
+ size_t plen, nlen;
+ char *event;
+ struct afb_ditf *ditf = closure;
+
+ /* makes the event name */
+ plen = strlen(ditf->prefix);
+ nlen = strlen(name);
+ event = alloca(nlen + plen + 2);
+ memcpy(event, ditf->prefix, plen);
+ event[plen] = '/';
+ memcpy(event + plen + 1, name, nlen + 1);
+
+ /* broadcast the event */
+ return afb_evt_broadcast(event, object);
+}
+
+static int rootdir_open_locale_cb(void *closure, const char *filename, int flags, const char *locale)
+{
+ return afb_common_rootdir_open_locale(filename, flags, locale);
+}
+
+void afb_ditf_init(struct afb_ditf *ditf, const char *prefix)
+{
+ ditf->interface.verbosity = verbosity;
+ ditf->interface.mode = AFB_MODE_LOCAL;
+ ditf->interface.daemon.itf = &daemon_itf;
+ ditf->interface.daemon.closure = ditf;
+ afb_ditf_rename(ditf, prefix);
+}
+
+void afb_ditf_rename(struct afb_ditf *ditf, const char *prefix)
+{
+ ditf->prefix = prefix;
+}
+
--- /dev/null
+/*
+ * Copyright (C) 2016, 2017 "IoT.bzh"
+ * Author José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _GNU_SOURCE
+#define NO_BINDING_VERBOSE_MACRO
+
+#include <string.h>
+#include <dlfcn.h>
+#include <assert.h>
+
+#include <afb/afb-binding.h>
+
+#include "afb-apis.h"
+#include "afb-svc.h"
+#include "afb-evt.h"
+#include "afb-common.h"
+#include "afb-context.h"
+#include "afb-api-so.h"
+#include "afb-xreq.h"
+#include "verbose.h"
+
+
+struct afb_binding_interface;
+
+struct afb_ditf
+{
+ struct afb_binding_interface interface;
+ const char *prefix;
+};
+
+extern void afb_ditf_init(struct afb_ditf *ditf, const char *prefix);
+extern void afb_ditf_rename(struct afb_ditf *ditf, const char *prefix);
+
Code Review / src / app-framework-binder.git / commitdiff