aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Fix: Fixed timeout handling for new clients in request queue

Browse Source
This commit is contained in:
Philipp Schafft 2022-03-25 22:43:57 +00:00
parent 153543dc7f
commit 74c03908c5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/connection.c
View File

@ -270,10 +270,10 @@ static bool client_queue_check_ready(client_queue_t *queue, int timeout, time_t
return true; return true;
} }
static bool client_queue_check_ready_wait(client_queue_t *queue, int timeout, time_t connection_timeout) static bool client_queue_check_ready_wait(client_queue_t *queue, int timeout, int connection_timeout)
{ {
while (queue->running) { while (queue->running) {
if (client_queue_check_ready(queue, timeout, connection_timeout)) if (client_queue_check_ready(queue, timeout, time(NULL) - connection_timeout))
return true; return true;
if (!queue->head) if (!queue->head)
@ -702,16 +702,18 @@ static void * process_request_queue (client_queue_t *queue)
client_queue_entry_t *stop = NULL; client_queue_entry_t *stop = NULL;
client_queue_entry_t *node; client_queue_entry_t *node;
ice_config_t *config; ice_config_t *config;
time_t timeout; int timeout;
time_t now;
config = config_get_config(); config = config_get_config();
timeout = time(NULL) - config->header_timeout; timeout = config->header_timeout;
config_release_config(); config_release_config();
client_queue_check_ready_wait(queue, QUEUE_READY_TIMEOUT, timeout); client_queue_check_ready_wait(queue, QUEUE_READY_TIMEOUT, timeout);
now = time(NULL);
while ((node = client_queue_shift_ready(queue, stop))) { while ((node = client_queue_shift_ready(queue, stop))) {
if (process_request_queue_one(node, timeout)) if (process_request_queue_one(node, now - timeout))
continue; continue;
client_queue_add(queue, node); client_queue_add(queue, node);
@ -767,13 +769,13 @@ static void * process_request_body_queue (client_queue_t *queue)
client_queue_entry_t *stop = NULL; client_queue_entry_t *stop = NULL;
client_queue_entry_t *node; client_queue_entry_t *node;
ice_config_t *config; ice_config_t *config;
time_t timeout; int timeout;
size_t body_size_limit; size_t body_size_limit;
ICECAST_LOG_DDEBUG("Processing body queue."); ICECAST_LOG_DDEBUG("Processing body queue.");
config = config_get_config(); config = config_get_config();
timeout = time(NULL) - config->body_timeout; timeout = config->body_timeout;
body_size_limit = config->body_size_limit; body_size_limit = config->body_size_limit;
config_release_config(); config_release_config();