/*
This file is part of GNUnet.
- (C) 2007, 2008, 2009, 2012 Christian Grothoff (and other contributing authors)
+ (C) 2007-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "resolver.h"
/**
- * A cached DNS lookup result.
+ * A cached DNS lookup result (for reverse lookup).
*/
struct IPCache
{
}
if (0 ==
- getnameinfo (sa, salen, hostname, sizeof (hostname), NULL,
+ getnameinfo (sa, salen,
+ hostname, sizeof (hostname),
+ NULL,
0, 0))
+ {
cache->addr = GNUNET_strdup (hostname);
+ }
}
#endif
ent = gethostbyaddr (cache->ip,
cache->ip_len,
cache->af);
- if (ent != NULL)
+ if (NULL != ent)
+ {
cache->addr = GNUNET_strdup (ent->h_name);
+ }
}
#endif
cache_resolve (struct IPCache *cache)
{
#if HAVE_GETNAMEINFO
- if (cache->addr == NULL)
+ if (NULL == cache->addr)
getnameinfo_resolve (cache);
#endif
#if HAVE_GETHOSTBYADDR
- if (cache->addr == NULL)
+ if (NULL == cache->addr)
gethostbyaddr_resolve (cache);
#endif
}
*
* @param client handle to the client making the request (for sending the reply)
* @param af AF_INET or AF_INET6
- * @param ip 'struct in_addr' or 'struct in6_addr'
+ * @param ip `struct in_addr` or `struct in6_addr`
*/
static void
get_ip_as_string (struct GNUNET_SERVER_Client *client,
struct GNUNET_TIME_Absolute now;
struct GNUNET_SERVER_TransmitContext *tc;
size_t ip_len;
+ struct in6_addr ix;
switch (af)
{
next = cache_head;
while ( (NULL != (pos = next)) &&
( (pos->af != af) ||
- (pos->ip_len != ip_len) ||
+ (pos->ip_len != ip_len) ||
(0 != memcmp (pos->ip, ip, ip_len))) )
{
next = pos->next;
- if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
- 60 * 60 * 1000)
+ if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
+ 60 * 60 * 1000 * 1000LL)
{
GNUNET_CONTAINER_DLL_remove (cache_head,
cache_tail,
continue;
}
}
- if (pos != NULL)
+ if (NULL != pos)
{
- pos->last_request = now;
- if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value <
- 60 * 60 * 1000)
+ if ( (1 == inet_pton (af,
+ pos->ip,
+ &ix)) &&
+ (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us >
+ 120 * 1000 * 1000LL) )
{
+ /* try again if still numeric AND 2 minutes have expired */
GNUNET_free_non_null (pos->addr);
pos->addr = NULL;
cache_resolve (pos);
+ pos->last_request = now;
}
}
else
cache_resolve (pos);
}
tc = GNUNET_SERVER_transmit_context_create (client);
- if (pos->addr != NULL)
+ if (NULL != pos->addr)
GNUNET_SERVER_transmit_context_append_data (tc, pos->addr,
strlen (pos->addr) + 1,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
struct addrinfo *result;
struct addrinfo *pos;
+#ifdef WINDOWS
+ /* Due to a bug, getaddrinfo will not return a mix of different families */
+ if (AF_UNSPEC == af)
+ {
+ int ret1;
+ int ret2;
+ ret1 = getaddrinfo_resolve (tc, hostname, AF_INET);
+ ret2 = getaddrinfo_resolve (tc, hostname, AF_INET6);
+ if ((ret1 == GNUNET_OK) || (ret2 == GNUNET_OK))
+ return GNUNET_OK;
+ if ((ret1 == GNUNET_SYSERR) || (ret2 == GNUNET_SYSERR))
+ return GNUNET_SYSERR;
+ return GNUNET_NO;
+ }
+#endif
+
memset (&hints, 0, sizeof (struct addrinfo));
-// FIXME in PlibC
-#ifndef MINGW
hints.ai_family = af;
-#else
- hints.ai_family = AF_INET;
-#endif
hints.ai_socktype = SOCK_STREAM; /* go for TCP */
if (0 != (s = getaddrinfo (hostname, NULL, &hints, &result)))
AF_INET) ? "IPv4" : ((af == AF_INET6) ? "IPv6" : "any"),
gai_strerror (s));
if ((s == EAI_BADFLAGS) || (s == EAI_MEMORY)
-#ifndef MINGW
+#ifndef WINDOWS
|| (s == EAI_SYSTEM)
#else
- // FIXME NILS
|| 1
#endif
)
return GNUNET_NO; /* other function may still succeed */
return GNUNET_SYSERR;
}
- if (result == NULL)
+ if (NULL == result)
return GNUNET_SYSERR;
- pos = result;
- while (pos != NULL)
+ for (pos = result; pos != NULL; pos = pos->ai_next)
{
switch (pos->ai_family)
{
default:
/* unsupported, skip */
break;
- }
- pos = pos->ai_next;
+ }
}
freeaddrinfo (result);
return GNUNET_OK;
int ret1;
int ret2;
+#ifdef WINDOWS
+ /* gethostbyname2() in plibc is a compat dummy that calls gethostbyname(). */
+ return GNUNET_NO;
+#endif
+
if (af == AF_UNSPEC)
{
ret1 = gethostbyname2_resolve (tc, hostname, AF_INET);
{
case AF_INET:
GNUNET_assert (hp->h_length == sizeof (struct in_addr));
- GNUNET_SERVER_transmit_context_append_data (tc,
- hp->h_addr_list[0],
+ GNUNET_SERVER_transmit_context_append_data (tc,
+ hp->h_addr_list[0],
hp->h_length,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
break;
case AF_INET6:
GNUNET_assert (hp->h_length == sizeof (struct in6_addr));
- GNUNET_SERVER_transmit_context_append_data (tc,
- hp->h_addr_list[0],
+ GNUNET_SERVER_transmit_context_append_data (tc,
+ hp->h_addr_list[0],
hp->h_length,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
break;
return GNUNET_SYSERR;
}
GNUNET_assert (hp->h_length == sizeof (struct in_addr));
- GNUNET_SERVER_transmit_context_append_data (tc,
+ GNUNET_SERVER_transmit_context_append_data (tc,
hp->h_addr_list[0],
hp->h_length,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
* @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
*/
static void
-get_ip_from_hostname (struct GNUNET_SERVER_Client *client, const char *hostname,
+get_ip_from_hostname (struct GNUNET_SERVER_Client *client,
+ const char *hostname,
int af)
{
int ret;
* @param message the actual message
*/
static void
-handle_get (void *cls, struct GNUNET_SERVER_Client *client,
+handle_get (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
uint16_t msize;
{
/* IP from hostname */
const char *hostname;
-
+
hostname = (const char *) &msg[1];
if (hostname[size - 1] != '\0')
{
}
{
char buf[INET6_ADDRSTRLEN];
-
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolver asked to look up IP address `%s'.\n",
+ "Resolver asked to look up IP address `%s'.\n",
inet_ntop (af, ip, buf, sizeof (buf)));
}
- get_ip_as_string (client, af, ip);
+ get_ip_as_string (client, af, ip);
}
/**
* MINIMIZE heap size (way below 128k) since this process doesn't need much.
*/
-void __attribute__ ((constructor)) GNUNET_ARM_memory_init ()
+void __attribute__ ((constructor))
+GNUNET_ARM_memory_init ()
{
mallopt (M_TRIM_THRESHOLD, 4 * 1024);
mallopt (M_TOP_PAD, 1 * 1024);
projects / oweals / gnunet.git / blobdiff