[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8627 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8627 - gnunet/src/util |
Date: |
Sun, 5 Jul 2009 14:36:30 -0600 |
Author: grothoff
Date: 2009-07-05 14:36:30 -0600 (Sun, 05 Jul 2009)
New Revision: 8627
Modified:
gnunet/src/util/network.c
gnunet/src/util/test_network.c
Log:
tolerate funky IPv4/Ipv6 localhost configs and getaddr returning only IPv6
addresses for af-unspec
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2009-07-05 19:57:13 UTC (rev 8626)
+++ gnunet/src/util/network.c 2009-07-05 20:36:30 UTC (rev 8627)
@@ -42,6 +42,13 @@
#define DEBUG_NETWORK GNUNET_NO
+/**
+ * List of address families to give as hints to
+ * getaddrinfo, in reverse order of preference.
+ */
+static int address_families[] =
+ { AF_INET, AF_INET6, AF_UNSPEC };
+
struct GNUNET_NETWORK_TransmitHandle
{
@@ -106,6 +113,12 @@
struct sockaddr *addr;
/**
+ * Pointer to the hostname if socket was
+ * created using DNS lookup, otherwise NULL.
+ */
+ char *hostname;
+
+ /**
* Pointer to our write buffer.
*/
char *write_buffer;
@@ -133,6 +146,12 @@
socklen_t addrlen;
/**
+ * Offset in our address family list
+ * that we used last.
+ */
+ int af_fam_offset;
+
+ /**
* Connect task that we may need to wait for.
*/
GNUNET_SCHEDULER_TaskIdentifier connect_task;
@@ -390,6 +409,37 @@
/**
+ * Perform a DNS lookup for the hostname associated
+ * with the current socket, iterating over the address
+ * families as specified in the "address_families" array.
+ */
+static void
+try_lookup (struct GNUNET_NETWORK_SocketHandle *sock)
+{
+ struct addrinfo hints;
+ int ec;
+
+ while ( (sock->ai_pos == NULL) &&
+ (sock->af_fam_offset > 0) )
+ {
+ if (sock->ai != NULL)
+ freeaddrinfo (sock->ai);
+ memset (&hints, 0, sizeof (hints));
+ hints.ai_family = address_families[--sock->af_fam_offset];
+ hints.ai_socktype = SOCK_STREAM;
+ if (0 != (ec = getaddrinfo (sock->hostname, NULL, &hints, &sock->ai)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
+ "`%s' failed for hostname `%s': %s\n",
+ "getaddrinfo", sock->hostname, gai_strerror (ec));
+ sock->ai = NULL;
+ }
+ sock->ai_pos = sock->ai;
+ }
+}
+
+
+/**
* Initiate asynchronous TCP connect request.
*
* @param sock what socket to connect
@@ -409,6 +459,8 @@
while (1)
{
if (sock->ai_pos == NULL)
+ try_lookup (sock);
+ if (sock->ai_pos == NULL)
{
/* no more addresses to try, fatal! */
return GNUNET_SYSERR;
@@ -559,8 +611,6 @@
uint16_t port, size_t maxbuf)
{
struct GNUNET_NETWORK_SocketHandle *ret;
- struct addrinfo hints;
- int ec;
ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_SocketHandle) + maxbuf);
ret->sock = -1;
@@ -568,21 +618,13 @@
ret->write_buffer = (char *) &ret[1];
ret->write_buffer_size = maxbuf;
ret->port = port;
- memset (&hints, 0, sizeof (hints));
- hints.ai_family = AF_UNSPEC;
- hints.ai_socktype = SOCK_STREAM;
- if (0 != (ec = getaddrinfo (hostname, NULL, &hints, &ret->ai)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO | GNUNET_ERROR_TYPE_BULK,
- "`%s' failed for hostname `%s': %s\n",
- "getaddrinfo", hostname, gai_strerror (ec));
- GNUNET_free (ret);
- return NULL;
- }
- ret->ai_pos = ret->ai;
+ ret->af_fam_offset = sizeof (address_families) / sizeof(address_families[0]);
+ ret->hostname = GNUNET_strdup (hostname);
if (GNUNET_SYSERR == try_connect (ret))
{
- freeaddrinfo (ret->ai);
+ if (NULL != ret->ai)
+ freeaddrinfo (ret->ai);
+ GNUNET_free (ret->hostname);
GNUNET_free (ret);
return NULL;
}
@@ -724,7 +766,8 @@
GNUNET_break (0 == CLOSE (sock->sock));
GNUNET_free_non_null (sock->addr);
if (sock->ai != NULL)
- freeaddrinfo (sock->ai);
+ freeaddrinfo (sock->ai);
+ GNUNET_free_non_null (sock->hostname);
GNUNET_free (sock);
}
Modified: gnunet/src/util/test_network.c
===================================================================
--- gnunet/src/util/test_network.c 2009-07-05 19:57:13 UTC (rev 8626)
+++ gnunet/src/util/test_network.c 2009-07-05 20:36:30 UTC (rev 8627)
@@ -58,6 +58,7 @@
memset (&sa, 0, sizeof (sa));
sa.sin_port = htons (PORT);
+ sa.sin_family = AF_INET;
fd = SOCKET (AF_INET, SOCK_STREAM, 0);
GNUNET_assert (fd >= 0);
if (SETSOCKOPT (fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) < 0)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8627 - gnunet/src/util,
gnunet <=