Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

websocket: fix some bugs when requesting non-existant node

Browse source
This commit is contained in:
Steffen Vogel 2018-06-12 20:02:43 +02:00
parent 355831d8a9
commit d3169c404a
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/nodes/websocket.c
View file

@ -145,7 +145,7 @@ static int websocket_connection_write(struct websocket_connection *c, struct sam
{
int pushed;
if (c->state != WEBSOCKET_CONNECTION_STATE_ESTABLISHED)
if (c->state != WEBSOCKET_CONNECTION_STATE_INITIALIZED)
return -1;
pushed = queue_push_many(&c->queue, (void **) smps, cnt);
@ -181,6 +181,8 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
c->wsi = wsi;
c->state = WEBSOCKET_CONNECTION_STATE_ESTABLISHED;
debug(LOG_WEBSOCKET | 10, "Established WebSocket connection: %s", websocket_connection_name(c));
if (reason == LWS_CALLBACK_CLIENT_ESTABLISHED)
c->mode = WEBSOCKET_MODE_CLIENT;
else {
@ -235,7 +237,7 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
list_push(&connections, c);
debug(LOG_WEBSOCKET | 10, "Established WebSocket connection: %s", websocket_connection_name(c));
debug(LOG_WEBSOCKET | 10, "Initialized WebSocket connection: %s", websocket_connection_name(c));
break;
case LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
@ -255,7 +257,8 @@ int websocket_protocol_cb(struct lws *wsi, enum lws_callback_reasons reason, voi
if (connections.state == STATE_INITIALIZED)
list_remove(&connections, c);
websocket_connection_destroy(c);
if (c->state == WEBSOCKET_CONNECTION_STATE_INITIALIZED)
websocket_connection_destroy(c);
if (c->mode == WEBSOCKET_MODE_CLIENT)
free(c);
@ -380,12 +383,12 @@ int websocket_deinit()
}
/* Wait for all connections to be closed */
while (list_length(&connections) > 0) {
info("Waiting for shutdown of %zu connections", list_length(&connections));
for (int i = 0; i < 10 && list_length(&connections) > 0; i++) {
info("Waiting for shutdown of %zu connections... %d/10", list_length(&connections), i+1);
sleep(1);
}
ret = list_destroy(&connections, (dtor_cb_t) websocket_destination_destroy, true);
ret = list_destroy(&connections, (dtor_cb_t) websocket_connection_destroy, false);
if (ret)
return ret;