From 393a809105baea0dd694cbac57c11f229d50b6e6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Thu, 22 Feb 2018 14:55:24 +0100 Subject: [PATCH] afb-supervision: Fix error on 'trace' MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I81c89e6c9406df583087845d6b38a19fff8ab0eb Signed-off-by: José Bollo --- src/afb-supervision.c | 4 ++-- src/afb-trace.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/afb-supervision.c b/src/afb-supervision.c index 0f8a16bb..1ff8f8b5 100644 --- a/src/afb-supervision.c +++ b/src/afb-supervision.c @@ -291,7 +291,6 @@ static const char *verbs[] = { "break", "config", "do", "exit", "sclose", "slist", "trace", "wait" }; enum { Break , Config , Do , Exit , Sclose , Slist , Trace , Wait }; - static void on_supervision_call(void *closure, struct afb_xreq *xreq) { int i, rc; @@ -349,7 +348,8 @@ static void on_supervision_call(void *closure, struct afb_xreq *xreq) if (!trace) trace = afb_trace_create(supervision_apiname, NULL /* not bound to any session */); - req = afb_xreq_unstore((struct afb_stored_req*)xreq); + req = xreq_to_req(xreq); + add = drop = NULL; wrap_json_unpack(args, "{s?o s?o}", "add", &add, "drop", &drop); if (add) { rc = afb_trace_add(req, add, trace); diff --git a/src/afb-trace.c b/src/afb-trace.c index 1fa50ebc..125a9d61 100644 --- a/src/afb-trace.c +++ b/src/afb-trace.c @@ -1401,7 +1401,7 @@ static void add(void *closure, struct json_object *object) struct json_object *request, *event, *daemon, *service, *sub, *global, *session; memcpy (&desc, closure, sizeof desc); - request = event = daemon = service = sub = global = NULL; + request = event = daemon = service = sub = global = session = NULL; rc = wrap_json_unpack(object, "{s?s s?s s?s s?s s?s s?s s?o s?o s?o s?o s?o s?o}", "name", &desc.name, -- 2.16.6