[asterisk-commits] file: trunk r424157 - in /trunk: ./ res/res_pjsip_sdp_rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Sep 30 06:42:00 2014
New Revision: 424157

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424157
Log:
res_pjsip_sdp_rtp: Don't place an extra whitespace before 'rport' and don't put IPv6 addresses in brackets.

#SIPit31
........

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

Merged revisions 424156 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_sdp_rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_sdp_rtp.c?view=diff&rev=424157&r1=424156&r2=424157
==============================================================================
--- trunk/res/res_pjsip_sdp_rtp.c (original)
+++ trunk/res/res_pjsip_sdp_rtp.c Tue Sep 30 06:42:00 2014
@@ -371,7 +371,7 @@
 		struct ast_str *attr_candidate = ast_str_create(128);
 
 		ast_str_set(&attr_candidate, -1, "%s %u %s %d %s ", candidate->foundation, candidate->id, candidate->transport,
-					candidate->priority, ast_sockaddr_stringify_host(&candidate->address));
+					candidate->priority, ast_sockaddr_stringify_addr_remote(&candidate->address));
 		ast_str_append(&attr_candidate, -1, "%s typ ", ast_sockaddr_stringify_port(&candidate->address));
 
 		switch (candidate->type) {
@@ -387,7 +387,7 @@
 		}
 
 		if (!ast_sockaddr_isnull(&candidate->relay_address)) {
-			ast_str_append(&attr_candidate, -1, " raddr %s rport ", ast_sockaddr_stringify_host(&candidate->relay_address));
+			ast_str_append(&attr_candidate, -1, " raddr %s rport", ast_sockaddr_stringify_addr_remote(&candidate->relay_address));
 			ast_str_append(&attr_candidate, -1, " %s", ast_sockaddr_stringify_port(&candidate->relay_address));
 		}