From 05f0317acf1c81fc93d08a9e9790b998a361477c Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 11 Apr 2016 08:52:36 -0400 Subject: [PATCH] fix the 'media address' parameter address family string in SDP was not produced when used Change-Id: I33f23a8f3d600ecdb9b469368ac5a8929e4b2fa1 --- daemon/sdp.c | 4 +++- utils/ng-client | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/daemon/sdp.c b/daemon/sdp.c index 4b03276fe..34f684849 100644 --- a/daemon/sdp.c +++ b/daemon/sdp.c @@ -1482,7 +1482,9 @@ static int replace_network_address(struct sdp_chopper *chop, struct network_addr __parse_address(&flags->parsed_media_address, NULL, NULL, &flags->media_address); if (!is_addr_unspecified(&flags->parsed_media_address)) - len = sprintf(buf, "%s", sockaddr_print_buf(&flags->parsed_media_address)); + len = sprintf(buf, "%s %s", + flags->parsed_media_address.family->rfc_name, + sockaddr_print_buf(&flags->parsed_media_address)); else call_stream_address46(buf, ps, SAF_NG, &len, NULL); chopper_append_dup(chop, buf, len); diff --git a/utils/ng-client b/utils/ng-client index c69512fab..45560d677 100755 --- a/utils/ng-client +++ b/utils/ng-client @@ -44,13 +44,14 @@ GetOptions( 'delete-delay=i' => \$options{'delete-delay'}, 'reset' => \$options{'reset'}, 'port-latching' => \$options{'port latching'}, + 'media-address=s' => \$options{'media address'}, ) or die; my $cmd = shift(@ARGV) or die; my %packet = (command => $cmd); -for my $x (split(',', 'from-tag,to-tag,call-id,transport protocol,media address,ICE,address family,TOS,DTLS,via-branch,delete-delay')) { +for my $x (split(',', 'from-tag,to-tag,call-id,transport protocol,media address,ICE,address family,TOS,DTLS,via-branch,delete-delay,media address')) { defined($options{$x}) and $packet{$x} = $options{$x}; } for my $x (split(',', 'trust address,symmetric,asymmetric,force,strict source,media handover,sip source address,reset,port latching')) {