Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update copyright
[src/app-framework-main.git]
/
src
/
afm-user-daemon.c
diff --git
a/src/afm-user-daemon.c
b/src/afm-user-daemon.c
index
22c3d81
..
a7c8b1d
100644
(file)
--- a/
src/afm-user-daemon.c
+++ b/
src/afm-user-daemon.c
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-20
18
IoT.bzh
+ Copyright (C) 2015-20
20
IoT.bzh
author: José Bollo <jose.bollo@iot.bzh>
author: José Bollo <jose.bollo@iot.bzh>
@@
-48,7
+48,7
@@
static const char versionstr[] =
"\n"
" %s version="AFM_VERSION"\n"
"\n"
"\n"
" %s version="AFM_VERSION"\n"
"\n"
- " Copyright (C) 2015
, 2016, 2017
\"IoT.bzh\"\n"
+ " Copyright (C) 2015
-2020
\"IoT.bzh\"\n"
" AFB comes with ABSOLUTELY NO WARRANTY.\n"
" Licence Apache 2\n"
"\n";
" AFB comes with ABSOLUTELY NO WARRANTY.\n"
" Licence Apache 2\n"
"\n";
@@
-193,12
+193,17
@@
static void propagate(struct sd_bus_message *smsg, struct json_object *obj, void
{
int rc;
const char *verb = closure;
{
int rc;
const char *verb = closure;
+ const char *onbehalf = NULL; /* TODO: on behalf of the client */
INFO("method %s propagated for %s", verb, json_object_to_json_string(obj));
if (!pws)
jbus_reply_error_s(smsg, "disconnected");
else {
INFO("method %s propagated for %s", verb, json_object_to_json_string(obj));
if (!pws)
jbus_reply_error_s(smsg, "disconnected");
else {
+#if defined(AFB_PROTO_WS_VERSION) && (AFB_PROTO_WS_VERSION >= 3)
+ rc = afb_proto_ws_client_call(pws, verb, obj, sessionid, smsg, onbehalf);
+#else
rc = afb_proto_ws_client_call(pws, verb, obj, sessionid, smsg);
rc = afb_proto_ws_client_call(pws, verb, obj, sessionid, smsg);
+#endif
if (rc < 0)
ERROR("calling %s(%s) failed: %m\n", verb, json_object_to_json_string(obj));
}
if (rc < 0)
ERROR("calling %s(%s) failed: %m\n", verb, json_object_to_json_string(obj));
}