Author: file
Date: Tue Sep 30 06:36:14 2014
New Revision: 424154

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424154
Log:
res_rtp_asterisk: Ensure that the base and mapped address for candidates is 
present in SDP.

This change fixes an issue where ICE candidates put into the SDP did not contain
the 'raddr' and 'rport' information for server reflexive and relay candidates.

#SIPit31
........

Merged revisions 424151 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 424152 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424153 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=424154&r1=424153&r2=424154
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Tue Sep 30 06:36:14 2014
@@ -1151,7 +1151,7 @@
        pj_turn_sock_get_info(*turn_sock, &info);
 
        ast_rtp_ice_add_cand(rtp, component, conn_transport, 
PJ_ICE_CAND_TYPE_RELAYED, 65535, &info.relay_addr,
-               &info.relay_addr, NULL, pj_sockaddr_get_len(&info.relay_addr));
+               &info.relay_addr, &info.mapped_addr, 
pj_sockaddr_get_len(&info.relay_addr));
 
        if (component == AST_RTP_ICE_COMPONENT_RTP) {
                ast_sockaddr_copy(&rtp->rtp_loop, &loop);
@@ -2290,7 +2290,7 @@
                        pj_sockaddr_init(pj_AF_INET(), &address[0], &mapped, 
ntohs(answer.sin_port));
 
                        ast_rtp_ice_add_cand(rtp, component, transport, 
PJ_ICE_CAND_TYPE_SRFLX, 65535, &address[0], &base,
-                                            NULL, 
pj_sockaddr_get_len(&address[0]));
+                                            &base, 
pj_sockaddr_get_len(&address[0]));
                }
        }
 


-- 
_____________________________________________________________________
-- 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

Reply via email to