Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-26 03:43:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do proper cleanup, including websockets.

Browse Source
This commit is contained in:
Roger A. Light
2014-06-23 18:18:29 +01:00
parent 764b7e0a91
commit cc33a6e5af
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/loop.c
+7
View File
@@ -130,7 +130,11 @@ int mosquitto_main_loop(struct mosquitto_db *db, int *listensock, int listensock
}
context->pollfd_index = -1;
#ifdef WITH_WEBSOCKETS
if(context->sock != INVALID_SOCKET || context->wsi){
#else
if(context->sock != INVALID_SOCKET){
#endif
#ifdef WITH_BRIDGE
if(context->bridge){
_mosquitto_check_keepalive(db, context);
@@ -348,6 +352,9 @@ static void do_disconnect(struct mosquitto_db *db, struct mosquitto *context)
}
}
mqtt3_context_disconnect(db, context);
if(context->clean_session){
mqtt3_context_cleanup(db, context, true);
}
}
/* Error ocurred, probably an fd has been closed.
src/websockets.c
+5 -1
View File
@@ -129,7 +129,11 @@ static int callback_mqtt(struct libwebsocket_context *context,
case LWS_CALLBACK_CLOSED:
mosq = u->mosq;
mqtt3_context_cleanup(db, mosq, true);
mqtt3_context_disconnect(db, mosq);
if(context->clean_session){
mqtt3_context_cleanup(db, mosq, true);
}
mosq->wsi = NULL;
break;
case LWS_CALLBACK_SERVER_WRITEABLE: