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

[gnunet]

Author: grothoff
Date: 2012-04-25 17:34:47 +0200 (Wed, 25 Apr 2012)
New Revision: 21160

Modified:
   gnunet/src/util/server.c
   gnunet/src/util/service.c
Log:
-fixes

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-04-25 15:24:31 UTC (rev 21159)
+++ gnunet/src/util/server.c    2012-04-25 15:34:47 UTC (rev 21160)
@@ -554,14 +554,13 @@
     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 */

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2012-04-25 15:24:31 UTC (rev 21159)
+++ gnunet/src/util/service.c   2012-04-25 15:34:47 UTC (rev 21160)
@@ -1022,6 +1022,7 @@
     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))
     {