/*
- * Copyright (C) 2015-2019 "IoT.bzh"
+ * Copyright (C) 2015-2020 "IoT.bzh"
* Author José Bollo <jose.bollo@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
static int server_req_unsubscribe_cb(struct afb_xreq *xreq, struct afb_event_x2 *event)
{
- int rc, rc2;
+ int rc;
struct server_req *wreq = CONTAINER_OF_XREQ(struct server_req, xreq);
rc = afb_proto_ws_call_unsubscribe(wreq->call, afb_evt_event_x2_id(event));
- rc2 = afb_evt_listener_unwatch_x2(wreq->stubws->listener, event);
- if (rc >= 0 && rc2 < 0)
- rc = rc2;
if (rc < 0)
ERROR("error while unsubscribing event");
return rc;
if (proto == NULL && stubws->robust.reopen) {
fdev = stubws->robust.reopen(stubws->robust.closure);
if (fdev != NULL)
- proto = afb_stub_ws_create_proto(stubws, fdev, 0);
+ proto = afb_stub_ws_create_proto(stubws, fdev, 1);
}
return proto;
}
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);
}
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);
}
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;
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);
}