-fixes

diff --git a/src/util/server.c b/src/util/server.c
index 568380d5d542b9fbca1d75e1966273bc18a29029..4c110a134bf81f282513388d18fddfafc86054f6 100644 (file)
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -554,14 +554,13 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
     while (NULL != serverAddr[i])
     {
       seen = 0;
-      if (i > 0)
-       for (k=0;k<i-1;k++)
-         if ( (socklen[k] == socklen[i]) &&
-              (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) )
-         {
-           seen = 1;
-           break;
-         }
+      for (k=0;k<i;k++)
+       if ( (socklen[k] == socklen[i]) &&
+            (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) )
+       {
+         seen = 1;
+         break;
+       }
       if (0 != seen)
       {
        /* duplicate address, skip */

diff --git a/src/util/service.c b/src/util/service.c
index ef060daaa13923eb49af023425b4d48c0fc5c892..92c125df1c139be78cb308c1f32a098dd2f771d6 100644 (file)
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1022,6 +1022,7 @@ GNUNET_SERVICE_get_server_addresses (const char *service_name,
     memset (&hints, 0, sizeof (struct addrinfo));
     if (disablev6)
       hints.ai_family = AF_INET;
+    hints.ai_protocol = IPPROTO_TCP;
     if ((0 != (ret = getaddrinfo (hostname, NULL, &hints, &res))) ||
         (res == NULL))
     {