From: Joshua Colp <jcolp@digium.com>
Date: Mon, 18 Jun 2007 18:19:54 +0000 (+0000)
Subject: Merged revisions 69775 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2347
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59bc48bd055b63e4e22e60c10251c98a6bb71ca4;p=thirdparty%2Fasterisk.git

Merged revisions 69775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r69775 | file | 2007-06-18 14:18:12 -0400 (Mon, 18 Jun 2007) | 10 lines

Merged revisions 69765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69765 | file | 2007-06-18 14:13:03 -0400 (Mon, 18 Jun 2007) | 2 lines

Set the peer name on the dialog to the one configured in sip.conf and NOT the username to be used for authentication attempts. (issue #9967 reported by achauvin)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 69a5fbfe02..9d4472c987 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3027,7 +3027,7 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
 		ast_rtp_set_rtpkeepalive(dialog->trtp, peer->rtpkeepalive);
 	}
 
-	ast_string_field_set(dialog, peername, peer->username);
+	ast_string_field_set(dialog, peername, peer->name);
 	ast_string_field_set(dialog, authname, peer->username);
 	ast_string_field_set(dialog, username, peer->username);
 	ast_string_field_set(dialog, peersecret, peer->secret);