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

prevent race case when dealing with shoutcast style source clients and update

Browse Source 
response headers to those clients.

svn path=/icecast/trunk/icecast/; revision=13490
This commit is contained in:
Karl Heyes 2007-08-09 02:51:53 +00:00
parent a38bce62eb
commit e663a238ee
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/connection.c
View File

@ -311,6 +311,7 @@ static client_queue_t *_get_connection(void)
if (_con_queue == NULL) if (_con_queue == NULL)
_con_queue_tail = &_con_queue; _con_queue_tail = &_con_queue;
thread_mutex_unlock (&_con_queue_mutex); thread_mutex_unlock (&_con_queue_mutex);
node->next = NULL;
} }
return node; return node;
} }
@ -385,10 +386,12 @@ static void process_request_queue (void)
if (pass_it) if (pass_it)
{ {
thread_mutex_lock (&_req_queue_mutex);
if ((client_queue_t **)_req_queue_tail == &(node->next)) if ((client_queue_t **)_req_queue_tail == &(node->next))
_req_queue_tail = (volatile client_queue_t **)node_ref; _req_queue_tail = (volatile client_queue_t **)node_ref;
*node_ref = node->next; *node_ref = node->next;
node->next = NULL; node->next = NULL;
thread_mutex_unlock (&_req_queue_mutex);
_add_connection (node); _add_connection (node);
continue; continue;
} }
@ -397,9 +400,11 @@ static void process_request_queue (void)
{ {
if (len == 0 || client->con->error) if (len == 0 || client->con->error)
{ {
thread_mutex_lock (&_req_queue_mutex);
if ((client_queue_t **)_req_queue_tail == &node->next) if ((client_queue_t **)_req_queue_tail == &node->next)
_req_queue_tail = (volatile client_queue_t **)node_ref; _req_queue_tail = (volatile client_queue_t **)node_ref;
*node_ref = node->next; *node_ref = node->next;
thread_mutex_unlock (&_req_queue_mutex);
client_destroy (client); client_destroy (client);
free (node); free (node);
continue; continue;
@ -927,7 +932,7 @@ static void _handle_shoutcast_compatible (client_queue_t *node)
client->respcode = 200; client->respcode = 200;
/* send this non-blocking but if there is only a partial write /* send this non-blocking but if there is only a partial write
* then leave to header timeout */ * then leave to header timeout */
sock_write (client->con->sock, "OK2\r\n"); sock_write (client->con->sock, "OK2\r\nicy-caps:11\r\n\r\n");
node->offset -= (headers - client->refbuf->data); node->offset -= (headers - client->refbuf->data);
memmove (client->refbuf->data, headers, node->offset+1); memmove (client->refbuf->data, headers, node->offset+1);
node->shoutcast = 2; node->shoutcast = 2;