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
Improves compatibility with AddressSanitizers
[src/app-framework-binder.git]
/
src
/
afb-supervision.c
diff --git
a/src/afb-supervision.c
b/src/afb-supervision.c
index
0515234
..
6563d92
100644
(file)
--- a/
src/afb-supervision.c
+++ b/
src/afb-supervision.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");
@@
-32,9
+32,9
@@
#include <json-c/json.h>
#define AFB_BINDING_VERSION 3
#include <json-c/json.h>
#define AFB_BINDING_VERSION 3
+#define AFB_BINDING_NO_ROOT
#include <afb/afb-binding.h>
#include <afb/afb-binding.h>
-#include "afb-cred.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
#include "afb-api.h"
#include "afb-apiset.h"
#include "afb-api-so-v2.h"
@@
-162,14
+162,14
@@
static void try_connect_supervisor()
/* check existing path */
if (supervisor_socket_path[0] != '@' && access(supervisor_socket_path, F_OK)) {
/* check existing path */
if (supervisor_socket_path[0] != '@' && access(supervisor_socket_path, F_OK)) {
-
NOTICE
("Can't acces socket path %s: %m", supervisor_socket_path);
+
INFO
("Can't acces socket path %s: %m", supervisor_socket_path);
goto end;
}
/* socket connection */
fd = open_supervisor_socket(supervisor_socket_path);
if (fd < 0) {
goto end;
}
/* socket connection */
fd = open_supervisor_socket(supervisor_socket_path);
if (fd < 0) {
-
NOTICE
("Can't connect supervision socket to %s: %m", supervisor_socket_path);
+
INFO
("Can't connect supervision socket to %s: %m", supervisor_socket_path);
goto end;
}
goto end;
}
@@
-394,8
+394,7
@@
static void on_supervision_call(void *closure, struct afb_xreq *xreq)
if (!xapi)
afb_xreq_reply_unknown_api(xreq);
else {
if (!xapi)
afb_xreq_reply_unknown_api(xreq);
else {
- afb_cred_unref(xreq->cred);
- xreq->cred = NULL;
+ afb_context_change_cred(&xreq->context, NULL);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);
xreq->request.called_api = api;
xreq->request.called_verb = verb;
xreq->json = json_object_get(sub);