[asterisk-commits] file: branch 11 r424151 - /branches/11/res/res_rtp_asterisk.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Sep 30 06:31:12 2014
New Revision: 424151

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424151
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

Modified:
    branches/11/res/res_rtp_asterisk.c

Modified: branches/11/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_rtp_asterisk.c?view=diff&rev=424151&r1=424150&r2=424151
==============================================================================
--- branches/11/res/res_rtp_asterisk.c (original)
+++ branches/11/res/res_rtp_asterisk.c Tue Sep 30 06:31:12 2014
@@ -1139,7 +1139,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);
@@ -2269,7 +2269,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]));
 		}
 	}