[svn-commits] dvossel: branch 1.6.0 r206705 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Jul 15 15:21:34 2009
New Revision: 206705

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=206705
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=206705&r1=206704&r2=206705
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Wed Jul 15 15:21:34 2009
@@ -12444,8 +12444,7 @@
 		 * 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 at 1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>