Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add gitreview file for icefish branch
[src/app-framework-binder.git]
/
src
/
afb-export.c
diff --git
a/src/afb-export.c
b/src/afb-export.c
index
4fbb131
..
800ee77
100644
(file)
--- a/
src/afb-export.c
+++ b/
src/afb-export.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 201
6-2019
"IoT.bzh"
+ * Copyright (C) 201
5-2020
"IoT.bzh"
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Author: José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-41,7
+41,6
@@
#endif
#include "afb-api-v3.h"
#include "afb-common.h"
#endif
#include "afb-api-v3.h"
#include "afb-common.h"
-#include "afb-cred.h"
#include "afb-evt.h"
#include "afb-export.h"
#include "afb-hook.h"
#include "afb-evt.h"
#include "afb-export.h"
#include "afb-hook.h"
@@
-49,6
+48,7
@@
#include "afb-session.h"
#include "afb-xreq.h"
#include "afb-calls.h"
#include "afb-session.h"
#include "afb-xreq.h"
#include "afb-calls.h"
+#include "afb-error-text.h"
#include "systemd.h"
#include "jobs.h"
#include "systemd.h"
#include "jobs.h"
@@
-1206,7
+1206,7
@@
static const struct afb_api_x3_itf hooked_api_x3_itf = {
/*
* Propagates the event to the service
*/
/*
* Propagates the event to the service
*/
-static void listener_of_events(void *closure, const char *event,
in
t eventid, struct json_object *object)
+static void listener_of_events(void *closure, const char *event,
uint16_
t eventid, struct json_object *object)
{
const struct globset_handler *handler;
void (*callback)(void *, const char*, struct json_object*, struct afb_api_x3*);
{
const struct globset_handler *handler;
void (*callback)(void *, const char*, struct json_object*, struct afb_api_x3*);
@@
-1250,12
+1250,12
@@
static void listener_of_events(void *closure, const char *event, int eventid, st
json_object_put(object);
}
json_object_put(object);
}
-static void listener_of_pushed_events(void *closure, const char *event,
in
t eventid, struct json_object *object)
+static void listener_of_pushed_events(void *closure, const char *event,
uint16_
t eventid, struct json_object *object)
{
listener_of_events(closure, event, eventid, object);
}
{
listener_of_events(closure, event, eventid, object);
}
-static void listener_of_broadcasted_events(void *closure, const char *event, struct json_object *object)
+static void listener_of_broadcasted_events(void *closure, const char *event, struct json_object *object
, const uuid_binary_t uuid, uint8_t hop
)
{
listener_of_events(closure, event, 0, object);
}
{
listener_of_events(closure, event, 0, object);
}
@@
-1818,12
+1818,12
@@
static void api_call_cb(void *closure, struct afb_xreq *xreq)
afb_api_v3_process_call(export->desc.v3, xreq);
break;
default:
afb_api_v3_process_call(export->desc.v3, xreq);
break;
default:
- afb_xreq_reply(xreq, NULL,
"bad-api-type"
, NULL);
+ afb_xreq_reply(xreq, NULL,
afb_error_text_internal_error
, NULL);
break;
}
}
break;
}
}
-static
struct json_object *api_describe_cb(void *closure
)
+static
void api_describe_cb(void *closure, void (*describecb)(void *, struct json_object *), void *clocb
)
{
struct afb_export *export = closure;
struct json_object *result;
{
struct afb_export *export = closure;
struct json_object *result;
@@
-1846,7
+1846,7
@@
static struct json_object *api_describe_cb(void *closure)
result = NULL;
break;
}
result = NULL;
break;
}
-
return result
;
+
describecb(clocb, result)
;
}
static int api_service_start_cb(void *closure)
}
static int api_service_start_cb(void *closure)
@@
-1937,12
+1937,12
@@
void afb_export_undeclare(struct afb_export *export)
int afb_export_subscribe(struct afb_export *export, struct afb_event_x2 *event)
{
int afb_export_subscribe(struct afb_export *export, struct afb_event_x2 *event)
{
- return afb_evt_
event_x2_add_watch
(export->listener, event);
+ return afb_evt_
listener_watch_x2
(export->listener, event);
}
int afb_export_unsubscribe(struct afb_export *export, struct afb_event_x2 *event)
{
}
int afb_export_unsubscribe(struct afb_export *export, struct afb_event_x2 *event)
{
- return afb_evt_
event_x2_remove_watch
(export->listener, event);
+ return afb_evt_
listener_unwatch_x2
(export->listener, event);
}
void afb_export_process_xreq(struct afb_export *export, struct afb_xreq *xreq)
}
void afb_export_process_xreq(struct afb_export *export, struct afb_xreq *xreq)
@@
-1952,7
+1952,6
@@
void afb_export_process_xreq(struct afb_export *export, struct afb_xreq *xreq)
void afb_export_context_init(struct afb_export *export, struct afb_context *context)
{
void afb_export_context_init(struct afb_export *export, struct afb_context *context)
{
- afb_context_init(context, export->session, NULL);
- context->validated = 1;
+ afb_context_init_validated(context, export->session, NULL, NULL);
}
}