ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not push TURN candidates in local list while looping. Use a copy.

This commit is contained in:
bossiel 2015-05-11 21:17:05 +00:00
parent d18dafbb74
commit abcb76c387
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
branches/2.0/doubango/tinyNET/src/ice/tnet_ice_ctx.c
View File

@ -1489,6 +1489,7 @@ static int _tnet_ice_ctx_fsm_GatheringReflexiveCandidatesDone_2_GatheringRelayCa
enum tnet_stun_state_e e_tunrn_state; enum tnet_stun_state_e e_tunrn_state;
tnet_ice_servers_L_t* ice_servers = tsk_null; tnet_ice_servers_L_t* ice_servers = tsk_null;
tnet_ice_server_t* ice_server; tnet_ice_server_t* ice_server;
tnet_ice_candidates_L_t* candidates_local_copy = tsk_null;;
// Create TURN condwait handle if not already done // Create TURN condwait handle if not already done
if (!self->turn.condwait && !(self->turn.condwait = tsk_condwait_create())) { if (!self->turn.condwait && !(self->turn.condwait = tsk_condwait_create())) {
@ -1497,6 +1498,11 @@ static int _tnet_ice_ctx_fsm_GatheringReflexiveCandidatesDone_2_GatheringRelayCa
goto bail; goto bail;
} }
// Copy local ICE candidates
tsk_list_lock(self->candidates_local);
candidates_local_copy = tsk_list_clone(self->candidates_local);
tsk_list_unlock(self->candidates_local);
// Take reference to the TURN servers // Take reference to the TURN servers
ice_servers = _tnet_ice_ctx_servers_copy(self, tnet_ice_server_proto_turn); ice_servers = _tnet_ice_ctx_servers_copy(self, tnet_ice_server_proto_turn);
if (!ice_servers || TSK_LIST_IS_EMPTY(ice_servers)) { if (!ice_servers || TSK_LIST_IS_EMPTY(ice_servers)) {
@ -1521,7 +1527,7 @@ next_server:
ice_server = (tnet_ice_server_t*)item_server->data; ice_server = (tnet_ice_server_t*)item_server->data;
// Create TURN sessions for each local host candidate // Create TURN sessions for each local host candidate
tsk_list_foreach(item, self->candidates_local) { tsk_list_foreach(item, candidates_local_copy) {
if (!(candidate = item->data)) { if (!(candidate = item->data)) {
continue; continue;
} }
@ -1586,7 +1592,7 @@ next_server:
// count the number of TURN sessions with alloc() = ok/nok and ignore ones without response // count the number of TURN sessions with alloc() = ok/nok and ignore ones without response
relay_addr_count_ok = 0; relay_addr_count_ok = 0;
tsk_list_foreach(item, self->candidates_local) { tsk_list_foreach(item, candidates_local_copy) {
if (!(candidate = item->data) || !candidate->turn.ss) { if (!(candidate = item->data) || !candidate->turn.ss) {
continue; continue;
} }
@ -1604,7 +1610,7 @@ next_server:
} }
// add/delete TURN candidates // add/delete TURN candidates
tsk_list_foreach(item, self->candidates_local) { tsk_list_foreach(item, candidates_local_copy) {
if (!(candidate = item->data) || !candidate->turn.ss) { if (!(candidate = item->data) || !candidate->turn.ss) {
continue; continue;
} }
@ -1666,6 +1672,7 @@ bail:
} }
} }
TSK_OBJECT_SAFE_FREE(ice_servers); TSK_OBJECT_SAFE_FREE(ice_servers);
TSK_OBJECT_SAFE_FREE(candidates_local_copy);
return ret; return ret;
} }