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

[gnunet]

Author: grothoff
Date: 2012-04-25 16:42:53 +0200 (Wed, 25 Apr 2012)
New Revision: 21155

Modified:
   gnunet/src/util/server.c
   gnunet/src/util/test_service.c
Log:
-skip duplicate addrs

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2012-04-25 14:15:56 UTC (rev 21154)
+++ gnunet/src/util/server.c    2012-04-25 14:42:53 UTC (rev 21155)
@@ -540,6 +540,8 @@
   struct GNUNET_NETWORK_Handle **lsocks;
   unsigned int i;
   unsigned int j;
+  unsigned int k;
+  int seen;
 
   i = 0;
   while (NULL != serverAddr[i])
@@ -551,6 +553,20 @@
     j = 0;
     while (NULL != serverAddr[i])
     {
+      seen = 0;
+      for (k=0;k<i-1;k++)
+       if ( (socklen[k] == socklen[i]) &&
+            (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) )
+       {
+         seen = 1;
+         break;
+       }
+      if (0 != seen)
+      {
+       /* duplicate address, skip */
+       i++;
+       continue;
+      }
       lsocks[j] = open_listen_socket (serverAddr[i], socklen[i]);
       if (NULL != lsocks[j])
         j++;

Modified: gnunet/src/util/test_service.c
===================================================================
--- gnunet/src/util/test_service.c      2012-04-25 14:15:56 UTC (rev 21154)
+++ gnunet/src/util/test_service.c      2012-04-25 14:42:53 UTC (rev 21155)
@@ -62,7 +62,6 @@
 {
   const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
 
-
   GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service confirmed running\n");
   client = GNUNET_CLIENT_connect ("test_service", cfg);