From: Martin Willi <martin@revosec.ch>
Date: Mon, 12 Nov 2012 14:49:48 +0000 (+0100)
Subject: Remove numeric conversion from resolver, it is done directly in host_t
X-Git-Tag: 5.0.2dr4~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d0fd25a875cde3fd50b6a8392a4b37203e92bf;p=thirdparty%2Fstrongswan.git

Remove numeric conversion from resolver, it is done directly in host_t
---

diff --git a/src/libstrongswan/networking/host_resolver.c b/src/libstrongswan/networking/host_resolver.c
index 73ca3326ba..71aa0b15f0 100644
--- a/src/libstrongswan/networking/host_resolver.c
+++ b/src/libstrongswan/networking/host_resolver.c
@@ -225,33 +225,6 @@ static void *resolve_hosts(private_host_resolver_t *this)
 	return NULL;
 }
 
-/**
- * Try to convert IP addresses directly
- */
-static host_t *try_numeric_lookup(char *name, int family)
-{
-	struct addrinfo hints, *result;
-	int error;
-	host_t *host;
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = family;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_flags = AI_NUMERICHOST;
-
-	error = getaddrinfo(name, NULL, &hints, &result);
-	if (error != 0)
-	{	/* not an IP address */
-		return NULL;
-	}
-	else
-	{	/* result is a linked list, but we use only the first address */
-		host = host_create_from_sockaddr(result->ai_addr);
-		freeaddrinfo(result);
-	}
-	return host;
-}
-
 METHOD(host_resolver_t, resolve, host_t*,
 	private_host_resolver_t *this, char *name, int family)
 {
@@ -273,11 +246,6 @@ METHOD(host_resolver_t, resolve, host_t*,
 	{	/* do not try to convert v6 addresses for v4 family */
 		return NULL;
 	}
-	result = try_numeric_lookup(name, family);
-	if (result)
-	{	/* shortcut for numeric IP addresses */
-		return result;
-	}
 	this->mutex->lock(this->mutex);
 	if (this->disabled)
 	{