aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-15 20:21:34 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-07-15 20:21:34 +0000
commitcc47cb810ac8e12ee572b4900b305457f14ca06a (patch)
tree217fd6a1736f2cd9e81e5eec0ab3d2d486d5bf9d /channels
parentee7b02c4617cc726c1a4563de4035524e1abb7dd (diff)
Merged revisions 206702 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r206702 | dvossel | 2009-07-15 15:20:01 -0500 (Wed, 15 Jul 2009) | 10 lines callerid(num) is wrong when username is missing A domain only sip uri <sip:123.123.123.123> would return 123.123.123.123 as callid num. Now, if the username is missing from a uri, the callerid num field is left empty. (closes issue #15476) Reported by: viraptor ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@206705 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index dff62f633..d14f9e074 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12444,8 +12444,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
* really a mistake and should go away.
*/
of = domain;
- }
- {
+ } else {
char *tmp = ast_strdupa(of);
/* We need to be able to handle auth-headers looking like
<sip:8164444422;phone-context=+1@1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>