[asterisk-commits] file: trunk r69779 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jun 18 13:19:54 2007
New Revision: 69779

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

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=69779&r1=69778&r2=69779
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jun 18 13:19:54 2007
@@ -3027,7 +3027,7 @@
 		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);