From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 25 Apr 2012 15:34:47 +0000 (+0000)
Subject: -fixes
X-Git-Tag: initial-import-from-subversion-38251~13776
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=eda18e9c9e0c3965490a23cd5121861f672a38ba;p=oweals%2Fgnunet.git

-fixes
---

diff --git a/src/util/server.c b/src/util/server.c
index 568380d5d..4c110a134 100644
--- 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 ef060daaa..92c125df1 100644
--- 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))
     {