/*
This file is part of GNUnet.
- (C) 2007-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2007-2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
struct sockaddr_in v4;
struct sockaddr_in6 v6;
size_t salen;
+ int ret;
switch (cache->af)
{
}
if (0 ==
- getnameinfo (sa, salen,
- hostname, sizeof (hostname),
- NULL,
- 0, 0))
+ (ret = getnameinfo (sa, salen,
+ hostname, sizeof (hostname),
+ NULL,
+ 0, 0)))
{
cache->addr = GNUNET_strdup (hostname);
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "getnameinfo failed: %s\n",
+ gai_strerror (ret));
+ }
}
#endif
{
cache->addr = GNUNET_strdup (ent->h_name);
}
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "gethostbyaddr failed: %s\n",
+ hstrerror (h_errno));
+ }
}
#endif
}
if (NULL != pos)
{
- if (1 == inet_pton (af,
- pos->ip,
- &ix))
+ 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;
}
- pos->last_request = now;
}
else
{
pos = GNUNET_malloc (sizeof (struct IPCache) + ip_len);
pos->ip = &pos[1];
- memcpy (&pos[1], ip, ip_len);
+ GNUNET_memcpy (&pos[1], ip, ip_len);
pos->last_request = now;
pos->last_refresh = now;
pos->ip_len = ip_len;
GNUNET_SERVER_transmit_context_append_data (tc, pos->addr,
strlen (pos->addr) + 1,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reverse lookup failed\n");
GNUNET_SERVER_transmit_context_append_data (tc, NULL, 0,
GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
GNUNET_SERVER_transmit_context_run (tc, GNUNET_TIME_UNIT_FOREVER_REL);
if (0 != (s = getaddrinfo (hostname, NULL, &hints, &result)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Could not resolve `%s' (%s): %s\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ _("Could not resolve `%s' (%s): %s\n"),
hostname,
(af ==
AF_INET) ? "IPv4" : ((af == AF_INET6) ? "IPv6" : "any"),
freeaddrinfo (result);
return GNUNET_OK;
}
-#endif
-#if HAVE_GETHOSTBYNAME2
+#elif HAVE_GETHOSTBYNAME2
+
+
static int
gethostbyname2_resolve (struct GNUNET_SERVER_TransmitContext *tc,
- const char *hostname, int af)
+ const char *hostname,
+ int af)
{
struct hostent *hp;
int ret1;
}
return GNUNET_OK;
}
-#endif
+
+#elif HAVE_GETHOSTBYNAME
-#if HAVE_GETHOSTBYNAME
static int
gethostbyname_resolve (struct GNUNET_SERVER_TransmitContext *tc,
const char *hostname)
struct hostent *hp;
hp = GETHOSTBYNAME (hostname);
- if (hp == NULL)
+ if (NULL == hp)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Could not find IP of host `%s': %s\n"), hostname,
+ _("Could not find IP of host `%s': %s\n"),
+ hostname,
hstrerror (h_errno));
return GNUNET_SYSERR;
}
#if HAVE_GETADDRINFO
if (ret == GNUNET_NO)
ret = getaddrinfo_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME2
+#elif HAVE_GETHOSTBYNAME2
if (ret == GNUNET_NO)
ret = gethostbyname2_resolve (tc, hostname, af);
-#endif
-#if HAVE_GETHOSTBYNAME
+#elif HAVE_GETHOSTBYNAME
if ((ret == GNUNET_NO) && ((af == AF_UNSPEC) || (af == PF_INET)))
gethostbyname_resolve (tc, hostname);
#endif
if (msize < sizeof (struct GNUNET_RESOLVER_GetMessage))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
msg = (const struct GNUNET_RESOLVER_GetMessage *) message;
size = msize - sizeof (struct GNUNET_RESOLVER_GetMessage);
direction = ntohl (msg->direction);
af = ntohl (msg->af);
- if (direction == GNUNET_NO)
+ if (GNUNET_NO == direction)
{
/* IP from hostname */
const char *hostname;
if (hostname[size - 1] != '\0')
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Resolver asked to look up `%s'.\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resolver asked to look up `%s'.\n",
hostname);
get_ip_from_hostname (client, hostname, af);
return;
if (size != sizeof (struct in_addr))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
break;
if (size != sizeof (struct in6_addr))
{
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
break;
default:
GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ GNUNET_SERVER_receive_done (client,
+ GNUNET_SYSERR);
return;
}
{
ret =
(GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "resolver", GNUNET_SERVICE_OPTION_NONE,
+ GNUNET_SERVICE_run (argc, argv,
+ "resolver",
+ GNUNET_SERVICE_OPTION_NONE,
&run, NULL)) ? 0 : 1;
while (NULL != (pos = cache_head))
{
return ret;
}
-#ifdef LINUX
+#if defined(LINUX) && defined(__GLIBC__)
#include <malloc.h>
/**