*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
+#include <stdio.h>
#include <string.h>
#include <errno.h>
-#include <afb/afb-binding.h>
+#include <json-c/json.h>
+
+#include <afb/afb-binding-v1.h>
+#include <afb/afb-binding-v2.h>
#include "afb-ditf.h"
#include "afb-evt.h"
#include "afb-common.h"
+#include "afb-xreq.h"
+#include "afb-hook.h"
+#include "jobs.h"
#include "verbose.h"
-
+/**********************************************
+* normal flow
+**********************************************/
static void vverbose_cb(void *closure, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
{
char *p;
if (vasprintf(&p, fmt, args) < 0)
vverbose(level, file, line, function, fmt, args);
else {
- verbose(level, file, line, function, "%s {binding %s}", p, ditf->prefix);
+ verbose(level, file, line, function, "[API %s] %s", ditf->api, p);
free(p);
}
}
struct afb_ditf *ditf = closure;
/* makes the event name */
- plen = strlen(ditf->prefix);
+ plen = strlen(ditf->api);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
- memcpy(event, ditf->prefix, plen);
+ memcpy(event, ditf->api, plen);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
struct afb_ditf *ditf = closure;
/* makes the event name */
- plen = strlen(ditf->prefix);
+ plen = strlen(ditf->api);
nlen = strlen(name);
event = alloca(nlen + plen + 2);
- memcpy(event, ditf->prefix, plen);
+ memcpy(event, ditf->api, plen);
event[plen] = '/';
memcpy(event + plen + 1, name, nlen + 1);
return afb_common_rootdir_open_locale(filename, flags, locale);
}
+static int queue_job_cb(void *closure, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout)
+{
+ return jobs_queue(group, timeout, callback, argument);
+}
+
+static struct afb_req unstore_req_cb(void *closure, struct afb_stored_req *sreq)
+{
+ return afb_xreq_unstore(sreq);
+}
+
+/**********************************************
+* hooked flow
+**********************************************/
+static void hooked_vverbose_cb(void *closure, int level, const char *file, int line, const char *function, const char *fmt, va_list args)
+{
+ struct afb_ditf *ditf = closure;
+ va_list ap;
+ va_copy(ap, args);
+ vverbose_cb(closure, level, file, line, function, fmt, args);
+ afb_hook_ditf_vverbose(ditf, level, file, line, function, fmt, ap);
+ va_end(ap);
+}
+
+static void hooked_old_vverbose_cb(void *closure, int level, const char *file, int line, const char *fmt, va_list args)
+{
+ hooked_vverbose_cb(closure, level, file, line, "?", fmt, args);
+}
+
+static struct afb_event hooked_event_make_cb(void *closure, const char *name)
+{
+ struct afb_ditf *ditf = closure;
+ struct afb_event r = event_make_cb(closure, name);
+ return afb_hook_ditf_event_make(ditf, name, r);
+}
+
+static int hooked_event_broadcast_cb(void *closure, const char *name, struct json_object *object)
+{
+ int r;
+ struct afb_ditf *ditf = closure;
+ json_object_get(object);
+ afb_hook_ditf_event_broadcast_before(ditf, name, json_object_get(object));
+ r = event_broadcast_cb(closure, name, object);
+ afb_hook_ditf_event_broadcast_after(ditf, name, object, r);
+ json_object_put(object);
+ return r;
+}
+
+static struct sd_event *hooked_get_event_loop(void *closure)
+{
+ struct afb_ditf *ditf = closure;
+ struct sd_event *r = afb_common_get_event_loop();
+ return afb_hook_ditf_get_event_loop(ditf, r);
+}
+
+static struct sd_bus *hooked_get_user_bus(void *closure)
+{
+ struct afb_ditf *ditf = closure;
+ struct sd_bus *r = afb_common_get_user_bus();
+ return afb_hook_ditf_get_user_bus(ditf, r);
+}
+
+static struct sd_bus *hooked_get_system_bus(void *closure)
+{
+ struct afb_ditf *ditf = closure;
+ struct sd_bus *r = afb_common_get_system_bus();
+ return afb_hook_ditf_get_system_bus(ditf, r);
+}
+
+static int hooked_rootdir_get_fd(void *closure)
+{
+ struct afb_ditf *ditf = closure;
+ int r = afb_common_rootdir_get_fd();
+ return afb_hook_ditf_rootdir_get_fd(ditf, r);
+}
+
+static int hooked_rootdir_open_locale_cb(void *closure, const char *filename, int flags, const char *locale)
+{
+ struct afb_ditf *ditf = closure;
+ int r = rootdir_open_locale_cb(closure, filename, flags, locale);
+ return afb_hook_ditf_rootdir_open_locale(ditf, filename, flags, locale, r);
+}
+
+static int hooked_queue_job_cb(void *closure, void (*callback)(int signum, void *arg), void *argument, void *group, int timeout)
+{
+ struct afb_ditf *ditf = closure;
+ int r = queue_job_cb(closure, callback, argument, group, timeout);
+ return afb_hook_ditf_queue_job(ditf, callback, argument, group, timeout, r);
+}
+
+static struct afb_req hooked_unstore_req_cb(void *closure, struct afb_stored_req *sreq)
+{
+ struct afb_ditf *ditf = closure;
+ afb_hook_ditf_unstore_req(ditf, sreq);
+ return unstore_req_cb(closure, sreq);
+}
+
+/**********************************************
+* vectors
+**********************************************/
static const struct afb_daemon_itf daemon_itf = {
- .vverbose = old_vverbose_cb,
+ .vverbose_v1 = old_vverbose_cb,
+ .vverbose_v2 = 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
+ .rootdir_open_locale = rootdir_open_locale_cb,
+ .queue_job = queue_job_cb,
+ .unstore_req = unstore_req_cb
+};
+
+static const struct afb_daemon_itf hooked_daemon_itf = {
+ .vverbose_v1 = hooked_old_vverbose_cb,
+ .vverbose_v2 = hooked_vverbose_cb,
+ .event_make = hooked_event_make_cb,
+ .event_broadcast = hooked_event_broadcast_cb,
+ .get_event_loop = hooked_get_event_loop,
+ .get_user_bus = hooked_get_user_bus,
+ .get_system_bus = hooked_get_system_bus,
+ .rootdir_get_fd = hooked_rootdir_get_fd,
+ .rootdir_open_locale = hooked_rootdir_open_locale_cb,
+ .queue_job = hooked_queue_job_cb,
+ .unstore_req = hooked_unstore_req_cb
};
-void afb_ditf_init(struct afb_ditf *ditf, const char *prefix)
+void afb_ditf_init_v2(struct afb_ditf *ditf, const char *api, struct afb_binding_data_v2 *data)
{
- 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);
+ ditf->version = 2;
+ ditf->v2 = data;
+ data->daemon.closure = ditf;
+ afb_ditf_rename(ditf, api);
}
-void afb_ditf_rename(struct afb_ditf *ditf, const char *prefix)
+void afb_ditf_init_v1(struct afb_ditf *ditf, const char *api, struct afb_binding_interface_v1 *itf)
{
- ditf->prefix = prefix;
+ ditf->version = 1;
+ ditf->v1 = itf;
+ itf->verbosity = verbosity;
+ itf->mode = AFB_MODE_LOCAL;
+ itf->daemon.closure = ditf;
+ afb_ditf_rename(ditf, api);
+}
+
+void afb_ditf_rename(struct afb_ditf *ditf, const char *api)
+{
+ ditf->api = api;
+ afb_ditf_update_hook(ditf);
+}
+
+void afb_ditf_update_hook(struct afb_ditf *ditf)
+{
+ int hooked = !!afb_hook_flags_ditf(ditf->api);
+ switch (ditf->version) {
+ case 1:
+ ditf->v1->daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+ break;
+ default:
+ case 2:
+ ditf->v2->daemon.itf = hooked ? &hooked_daemon_itf : &daemon_itf;
+ break;
+ }
}
Code Review / src / app-framework-binder.git / blobdiff