MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[websocket] Prefix globals with websocket_

Browse Source 
Avoids e.g. "event" being both the name of a global and a parameter name in
send_notify_reply()

credit lgtm.com
This commit is contained in:
ejurgensen 2020-08-10 22:36:00 +02:00
parent 23be5aa749
commit a0876e532c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/websocket.c
View File

@ -40,14 +40,14 @@ static struct lws_context *context;
static pthread_t tid_websocket; static pthread_t tid_websocket;
static int websocket_port; static int websocket_port;
static bool ws_exit = false; static bool websocket_exit = false;
// Event mask of events to notify websocket clients // Event mask of events to notify websocket clients
static short events; static short websocket_events;
// Event mask of events processed by the writeable callback // Event mask of events processed by the writeable callback
static short write_events; static short websocket_write_events;
// Counter for events to keep track of when to write // Counter for events to keep track of when to write
static unsigned short write_events_counter; static unsigned short websocket_write_events_counter;
@ -56,7 +56,7 @@ static void
listener_cb(short event_mask) listener_cb(short event_mask)
{ {
// Add event to the event mask, clients will be notified at the next break of the libwebsockets service loop // Add event to the event mask, clients will be notified at the next break of the libwebsockets service loop
events |= event_mask; websocket_events |= event_mask;
} }
/* /*
@ -266,7 +266,7 @@ callback_notify(struct lws *wsi, enum lws_callback_reasons reason, void *user, v
case LWS_CALLBACK_ESTABLISHED: case LWS_CALLBACK_ESTABLISHED:
// Initialize session data for new connections // Initialize session data for new connections
memset(session_data, 0, sizeof(struct ws_session_data_notify)); memset(session_data, 0, sizeof(struct ws_session_data_notify));
session_data->counter = write_events_counter; session_data->counter = websocket_write_events_counter;
break; break;
case LWS_CALLBACK_RECEIVE: case LWS_CALLBACK_RECEIVE:
@ -274,10 +274,10 @@ callback_notify(struct lws *wsi, enum lws_callback_reasons reason, void *user, v
break; break;
case LWS_CALLBACK_SERVER_WRITEABLE: case LWS_CALLBACK_SERVER_WRITEABLE:
if (write_events && (write_events_counter != session_data->counter)) if (websocket_write_events && (websocket_write_events_counter != session_data->counter))
{ {
send_notify_reply(write_events, wsi); send_notify_reply(websocket_write_events, wsi);
session_data->counter = write_events_counter; session_data->counter = websocket_write_events_counter;
} }
break; break;
@ -323,14 +323,14 @@ websocket(void *arg)
listener_add(listener_cb, LISTENER_UPDATE | LISTENER_DATABASE | LISTENER_PAIRING | LISTENER_SPOTIFY | LISTENER_LASTFM | LISTENER_SPEAKER listener_add(listener_cb, LISTENER_UPDATE | LISTENER_DATABASE | LISTENER_PAIRING | LISTENER_SPOTIFY | LISTENER_LASTFM | LISTENER_SPEAKER
| LISTENER_PLAYER | LISTENER_OPTIONS | LISTENER_VOLUME | LISTENER_QUEUE); | LISTENER_PLAYER | LISTENER_OPTIONS | LISTENER_VOLUME | LISTENER_QUEUE);
while(!ws_exit) while(!websocket_exit)
{ {
lws_service(context, 1000); lws_service(context, 1000);
if (events) if (websocket_events)
{ {
write_events = events; websocket_write_events = websocket_events;
write_events_counter++; websocket_write_events_counter++;
events = 0; websocket_events = 0;
lws_callback_on_writable_all_protocol(context, &protocols[WS_PROTOCOL_NOTIFY]); lws_callback_on_writable_all_protocol(context, &protocols[WS_PROTOCOL_NOTIFY]);
} }
} }
@ -407,7 +407,7 @@ websocket_init(void)
return -1; return -1;
} }
write_events_counter = 0; websocket_write_events_counter = 0;
ret = pthread_create(&tid_websocket, NULL, websocket, NULL); ret = pthread_create(&tid_websocket, NULL, websocket, NULL);
if (ret < 0) if (ret < 0)
{ {
@ -425,7 +425,7 @@ websocket_deinit(void)
{ {
if (websocket_port > 0) if (websocket_port > 0)
{ {
ws_exit = true; websocket_exit = true;
pthread_join(tid_websocket, NULL); pthread_join(tid_websocket, NULL);
} }
} }