d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Per-listener processing of websockets contexts.

Browse Source
This commit is contained in:
Roger A. Light 2014-05-26 17:09:44 +01:00
parent 58891769c1
commit e8f07d706d
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/loop.c
View File

@ -73,19 +73,12 @@ int mosquitto_main_loop(struct mosquitto_db *db, int *listensock, int listensock
int bridge_sock;
int rc;
#endif
#ifdef WITH_WEBSOCKETS
struct libwebsocket_context *ws_context = NULL;
#endif
#ifndef WIN32
sigemptyset(&sigblock);
sigaddset(&sigblock, SIGINT);
#endif
#ifdef WITH_WEBSOCKETS
ws_context = mosq_websockets_init(8080);
#endif
while(run){
#ifdef WITH_SYS_TREE
if(db->config->sys_interval > 0){
@ -299,11 +292,24 @@ int mosquitto_main_loop(struct mosquitto_db *db, int *listensock, int listensock
flag_tree_print = false;
}
#ifdef WITH_WEBSOCKETS
libwebsocket_service(ws_context, 0);
for(i=0; i<listener_max; i++){
/* Extremely hacky, should be using the lws provided external poll
* interface, but their interface has changed recently and ours
* will soon, so for now websockets clients are second class
* citizens. */
if(db->config->listeners[i].ws_context){
libwebsocket_service(db->config->listeners[i].ws_context, 0);
}
}
#endif
}
#ifdef WITH_WEBSOCKETS
libwebsocket_context_destroy(ws_context);
for(i=0; i<listener_max; i++){
if(db->config->listeners[i].ws_context){
libwebsocket_context_destroy(db->config->listeners[i].ws_context);
}
}
#endif
if(pollfds) _mosquitto_free(pollfds);