Author: file Date: Wed Oct 8 13:47:32 2014 New Revision: 424855 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424855 Log: res_rtp_asterisk: Allow only UDP ICE candidates.
The underlying library, pjnath, that res_rtp_asterisk uses for ICE support does not have support for ICE-TCP. As candidates are passed through directly to it this can cause error messages to occur when it receives something unexpected (such as a TCP candidate). This change merely ignores all non-UDP candidates so they never reach pjnath. ASTERISK-24326 #close Reported by: Joshua Colp ........ Merged revisions 424852 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 424853 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 424854 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/res/res_rtp_asterisk.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/res/res_rtp_asterisk.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=424855&r1=424854&r2=424855 ============================================================================== --- trunk/res/res_rtp_asterisk.c (original) +++ trunk/res/res_rtp_asterisk.c Wed Oct 8 13:47:32 2014 @@ -520,6 +520,11 @@ { struct ast_rtp *rtp = ast_rtp_instance_get_data(instance); struct ast_rtp_engine_ice_candidate *remote_candidate; + + /* ICE sessions only support UDP candidates */ + if (strcmp(candidate->transport, "UDP")) { + return; + } if (!rtp->ice_proposed_remote_candidates && !(rtp->ice_proposed_remote_candidates = ao2_container_alloc(1, NULL, ice_candidate_cmp))) { -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
