summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2009-04-17 14:44:56 +0000
committerJoshua Colp <jcolp@digium.com>2009-04-17 14:44:56 +0000
commit6d2b44638420d221f7bd2e8161d4dbd682c071c1 (patch)
tree853a5686548f4d097d1306172d3ccfc0e2024d5a
parentf7292de7baa52345c14807f1bedcfab244c3e4cb (diff)
Merged revisions 188946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r188946 | file | 2009-04-17 11:41:25 -0300 (Fri, 17 Apr 2009) | 15 lines Fix a bug where a value used to create the channel name was bogus. This commit fixes the scenario where an incoming call is authenticated using a peer entry. Previously the channel name was created using either the username setting from the sip.conf entry or the IP address that the call came from. Now the channel name will be created using the peer name itself. This commit will not change the way the channel name is generated for users or friends. (closes issue #14256) Reported by: Nick_Lewis Patches: chan_sip.c-chname.patch uploaded by Nick (license 657) Tested by: Nick_Lewis, file ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@188947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c51cf3a72..5d1b5e946 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -19689,7 +19689,7 @@ static int handle_request_invite(struct sip_pvt *p, struct sip_request *req, int
make_our_tag(p->tag, sizeof(p->tag));
/* First invitation - create the channel */
- c = sip_new(p, AST_STATE_DOWN, S_OR(p->username, NULL));
+ c = sip_new(p, AST_STATE_DOWN, S_OR(p->peername, NULL));
*recount = 1;
/* Save Record-Route for any later requests we make on this dialogue */