aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

Update: Run the check for removed events outside of the sending function

Browse Source
This commit is contained in:
Philipp Schafft 2024-01-25 11:11:56 +00:00
parent 7f59a845a8
commit a3e6c78f11
1 changed files with 8 additions and 7 deletions

15
src/event_stream.c

@ -247,13 +247,6 @@ static void event_stream_send_to_client(client_t *client)
} }
} }
} while (going); } while (going);
if (state->current_event->removed) {
ICECAST_LOG_INFO("Client %p %lu (%s) has fallen too far behind, removing",
client, client->con->id, client->con->ip);
client->con->error = 1;
}
} }
static void event_stream_cleanup_queue(void) static void event_stream_cleanup_queue(void)
@ -305,6 +298,14 @@ static void *event_stream_thread_function(void *arg)
next = avl_get_next(next); next = avl_get_next(next);
event_stream_send_to_client(client); event_stream_send_to_client(client);
{
event_stream_clientstate_t *state = client->format_data;
if (state->current_event->removed) {
ICECAST_LOG_INFO("Client %p %lu (%s) has fallen too far behind, removing",
client, client->con->id, client->con->ip);
client->con->error = 1;
}
}
if (client->con->error) { if (client->con->error) {
avl_delete(client_tree, (void *) client, _free_client); avl_delete(client_tree, (void *) client, _free_client);
} }