diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 14:46:49 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 14:46:49 +0000 |
| commit | 4c66d91e06a557dfe1d06cb4d4a0f36f268fca81 (patch) | |
| tree | 80e88a31d854a1ac6badab02ba5604e35d58c2c6 | |
| parent | f3d3f30bff2fc8f29a57c49d3d4e1572ce01aaea (diff) | |
Merged revisions 188947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r188947 | file | 2009-04-17 11:44:56 -0300 (Fri, 17 Apr 2009) | 22 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@188948 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 312c65bca..a7c209955 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -17305,7 +17305,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 */ |