[GNUnet-SVN] r15721 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2011-06-20 11:15:18 +0200 (Mon, 20 Jun 2011)
New Revision: 15721

Modified:
   gnunet/src/util/service.c
   gnunet/src/util/test_resolver_api.c
Log:
avoid duplicate binds

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2011-06-20 09:14:26 UTC (rev 15720)
+++ gnunet/src/util/service.c   2011-06-20 09:15:18 UTC (rev 15721)
@@ -1024,6 +1024,10 @@
          next = pos->ai_next;
          if ( (disablev6) && (pos->ai_family == AF_INET6))
            continue;
+         if (pos->ai_protocol != IPPROTO_TCP)
+           continue; /* not TCP */
+         if (pos->ai_socktype != SOCK_STREAM)
+           continue; /* huh? */
 #if DEBUG_SERVICE
          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                      "Service `%s' will bind to `%s'\n",

Modified: gnunet/src/util/test_resolver_api.c
===================================================================
--- gnunet/src/util/test_resolver_api.c 2011-06-20 09:14:26 UTC (rev 15720)
+++ gnunet/src/util/test_resolver_api.c 2011-06-20 09:15:18 UTC (rev 15721)
@@ -359,7 +359,6 @@
 
   GNUNET_RESOLVER_ip_get("localhost", AF_INET, timeout, &check_127,
                         cls);
-  fprintf (stderr, "Trying to get hostname for 127.0.0.1\n");
   GNUNET_RESOLVER_hostname_get((const struct sockaddr *) &sa,
       sizeof(struct sockaddr), GNUNET_YES, timeout, &check_localhost, cls);