From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 25 Apr 2012 14:42:53 +0000 (+0000)
Subject: -skip duplicate addrs
X-Git-Tag: initial-import-from-subversion-38251~13781
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=026b222dbbe038ce894c0ba33aa3c40950f6aecd;p=oweals%2Fgnunet.git

-skip duplicate addrs
---

diff --git a/src/util/server.c b/src/util/server.c
index 8f997ca39..a730a5481 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -540,6 +540,8 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
   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 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
     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++;
diff --git a/src/util/test_service.c b/src/util/test_service.c
index 078be7a41..cd73ceee4 100644
--- a/src/util/test_service.c
+++ b/src/util/test_service.c
@@ -62,7 +62,6 @@ ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   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);