[asterisk-commits] qwell: trunk r285456 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Sep  7 17:23:32 2010
New Revision: 285456

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285456
Log:
Merged revisions 285455 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285455 | qwell | 2010-09-07 17:22:14 -0500 (Tue, 07 Sep 2010) | 8 lines
  
  Don't automatically add domains for wildcard bindaddrs.
  
  (closes issue #17832)
  Reported by: oej
  Patches: 
        17832-wildcard.diff uploaded by qwell (license 4)
  Tested by: qwell
........

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

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=285456&r1=285455&r2=285456
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Sep  7 17:23:32 2010
@@ -27230,10 +27230,10 @@
 		char temp[MAXHOSTNAMELEN];
 
 		/* First our default IP address */
-		if (!ast_sockaddr_isnull(&bindaddr)) {
+		if (!ast_sockaddr_isnull(&bindaddr) && !ast_sockaddr_is_any(&bindaddr)) {
 			add_sip_domain(ast_sockaddr_stringify_addr(&bindaddr),
 				       SIP_DOMAIN_AUTO, NULL);
-		} else if (!ast_sockaddr_isnull(&internip)) {
+		} else if (!ast_sockaddr_isnull(&internip) && !ast_sockaddr_is_any(&internip)) {
 		/* Our internal IP address, if configured */
 			add_sip_domain(ast_sockaddr_stringify_addr(&internip),
 				       SIP_DOMAIN_AUTO, NULL);