aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-09-29 04:25:55 -04:00
Code

Fix: Corrected node vs. client

Browse Source
This commit is contained in:
Philipp Schafft 2020-09-30 19:22:36 +00:00
parent d92c9758a6
commit 81bd709acc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/source.c
View File

@ -343,9 +343,7 @@ client_t *source_find_client(source_t *source, connection_id_t id)
return NULL; return NULL;
} }
static inline void source_move_clients__single(source_t *source, avl_tree *from, avl_tree *to, avl_node *node) { static inline void source_move_clients__single(source_t *source, avl_tree *from, avl_tree *to, client_t *client) {
client_t *client = (client_t*)node->key;
avl_delete(from, client, NULL); avl_delete(from, client, NULL);
/* when switching a client to a different queue, be wary of the /* when switching a client to a different queue, be wary of the
@ -422,7 +420,7 @@ void source_move_clients(source_t *source, source_t *dest, connection_id_t *id)
avl_node *node = avl_get_first(source->pending_tree); avl_node *node = avl_get_first(source->pending_tree);
if (node == NULL) if (node == NULL)
break; break;
source_move_clients__single(source, source->pending_tree, dest->pending_tree, node); source_move_clients__single(source, source->pending_tree, dest->pending_tree, node->key);
count++; count++;
} }
@ -430,7 +428,7 @@ void source_move_clients(source_t *source, source_t *dest, connection_id_t *id)
avl_node *node = avl_get_first(source->client_tree); avl_node *node = avl_get_first(source->client_tree);
if (node == NULL) if (node == NULL)
break; break;
source_move_clients__single(source, source->client_tree, dest->pending_tree, node); source_move_clients__single(source, source->client_tree, dest->pending_tree, node->key);
count++; count++;
} }
} }