Skip to content

GitLab

Commit d6424def authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Little ICE fixes.

parent 5b29f574
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
coreapi/misc.c
View file @ d6424def
...@@ -912,7 +912,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess ...@@ -912,7 +912,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
if (result == TRUE) { if (result == TRUE) {
strncpy(desc->addr, rtp_candidate->taddr.ip, sizeof(desc->addr)); strncpy(desc->addr, rtp_candidate->taddr.ip, sizeof(desc->addr));
} else { } else {
ms_warning("If ICE has completed successfully, rtp_addr should be set!"); ms_warning("If ICE has completed successfully, rtp_candidate should be set!");
} }
} }
else { else {
...@@ -924,6 +924,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess ...@@ -924,6 +924,7 @@ void _update_local_media_description_from_ice(SalMediaDescription *desc, IceSess
SalStreamDescription *stream = &desc->streams[i]; SalStreamDescription *stream = &desc->streams[i];
IceCheckList *cl = ice_session_check_list(session, i); IceCheckList *cl = ice_session_check_list(session, i);
nb_candidates = 0; nb_candidates = 0;
rtp_candidate = rtcp_candidate = NULL;
if (!sal_stream_description_active(stream) || (cl == NULL)) continue; if (!sal_stream_description_active(stream) || (cl == NULL)) continue;
if (ice_check_list_state(cl) == ICL_Completed) { if (ice_check_list_state(cl) == ICL_Completed) {
if (use_nortpproxy) stream->set_nortpproxy = TRUE; if (use_nortpproxy) stream->set_nortpproxy = TRUE;
......
mediastreamer2 @ 85c5f163
Subproject commit bdf34ccb02acb99f6ac7996a6d5e625d34dd47cf Subproject commit 85c5f163f534183eda22cfcefb099bd5c128ee34
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment