[asterisk-commits] rmudgett: trunk r322426 - in /trunk: ./ main/dnsmgr.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jun  8 13:48:16 2011
New Revision: 322426

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

........
  r322425 | rmudgett | 2011-06-08 13:46:30 -0500 (Wed, 08 Jun 2011) | 16 lines
  
  SRV lookup attempted for SIP peers listed as an IP address.
  
  Asterisk attempts to SRV lookup a host name even if the host name is an IP
  address.  Regression introduced when IPv6 support was added.
  
  * Restored the check in ast_dnsmgr_lookup() to see if the given host name
  is an IP address.  The IP address could be in either IPv4 or IPv6 formats.
  
  (closes issue ASTERISK-17815)
  Reported by: Byron Clark
  Tested by: Byron Clark, Richard Mudgett
  Patches:
       issue19248_v1.8.patch - uploaded by Richard Mudgett (License #5621)
  
  Review: https://reviewboard.asterisk.org/r/1240/
........

Modified:
    trunk/   (props changed)
    trunk/main/dnsmgr.c

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

Modified: trunk/main/dnsmgr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dnsmgr.c?view=diff&rev=322426&r1=322425&r2=322426
==============================================================================
--- trunk/main/dnsmgr.c (original)
+++ trunk/main/dnsmgr.c Wed Jun  8 13:48:16 2011
@@ -128,6 +128,14 @@
 	}
 
 	if (*dnsmgr && !strcasecmp((*dnsmgr)->name, name)) {
+		return 0;
+	}
+
+	/*
+	 * If it's actually an IP address and not a name, there's no
+	 * need for a managed lookup.
+	 */
+	if (ast_sockaddr_parse(result, name, 0)) {
 		return 0;
 	}