diff options
| author |   Jose Bollo <jose.bollo@iot.bzh> | 2020-03-02 15:54:52 +0100 |
|---|---|---|
| committer | Jose Bollo <jose.bollo@iot.bzh> | 2020-03-02 16:26:10 +0100 |
| commit | 693249aac08971fe1503af37932511c168ddcc5c (patch) | |
| tree | f8d43d0b0503d2373d1800452c7790ad064921b2 | |
| parent | 2f38d2ea0537107def8514dc2e0c680ff8d31ca8 (diff) | |
Fix bug in session and token removal
The bug is trivial and was revealed by testing.
A copy paste bug...
Bug-AGL: SPEC-3220
Change-Id: I65ed8a3a3e377338fd41a2b64b8698f421bbacb9
Signed-off-by: Jose Bollo <jose.bollo@iot.bzh>
| -rw-r--r-- | src/afb-stub-ws.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/afb-stub-ws.c b/src/afb-stub-ws.c index 11cad076..7e9ab7a3 100644 --- a/src/afb-stub-ws.c +++ b/src/afb-stub-ws.c @@ -458,7 +458,7 @@ static void server_on_session_remove_cb(void *closure, uint16_t sessionid) struct afb_session *session; int rc; - rc = u16id2ptr_drop(&stubws->event_proxies, sessionid, (void**)&session); + rc = u16id2ptr_drop(&stubws->session_proxies, sessionid, (void**)&session); if (rc == 0 && session) afb_session_unref(session); } @@ -487,7 +487,7 @@ static void server_on_token_remove_cb(void *closure, uint16_t tokenid) struct afb_token *token; int rc; - rc = u16id2ptr_drop(&stubws->event_proxies, tokenid, (void**)&token); + rc = u16id2ptr_drop(&stubws->token_proxies, tokenid, (void**)&token); if (rc == 0 && token) afb_token_unref(token); } @@ -501,6 +501,7 @@ static void server_on_event_unexpected_cb(void *closure, uint16_t eventid) static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, const char *verb, struct json_object *args, uint16_t sessionid, uint16_t tokenid, const char *user_creds) { + const char *errstr = afb_error_text_internal_error; struct afb_stub_ws *stubws = closure; struct server_req *wreq; struct afb_session *session; @@ -541,11 +542,12 @@ static void server_on_call_cb(void *closure, struct afb_proto_ws_call *call, con afb_xreq_process(&wreq->xreq, stubws->apiset); return; -out_of_memory: no_session: + errstr = afb_error_text_unknown_session; +out_of_memory: json_object_put(args); afb_stub_ws_unref(stubws); - afb_proto_ws_call_reply(call, NULL, afb_error_text_internal_error, NULL); + afb_proto_ws_call_reply(call, NULL, errstr, NULL); afb_proto_ws_call_unref(call); } |