gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r5056 - in GNUnet/src: applications/testing transports


From: gnunet
Subject: [GNUnet-SVN] r5056 - in GNUnet/src: applications/testing transports
Date: Fri, 15 Jun 2007 15:48:58 -0600 (MDT)

Author: grothoff
Date: 2007-06-15 15:48:58 -0600 (Fri, 15 Jun 2007)
New Revision: 5056

Modified:
   GNUnet/src/applications/testing/gnunet-testing.conf
   GNUnet/src/applications/testing/testing.c
   GNUnet/src/transports/tcp.c
Log:
disable upnp during testing, faster connect timeout, minor fixes

Modified: GNUnet/src/applications/testing/gnunet-testing.conf
===================================================================
--- GNUnet/src/applications/testing/gnunet-testing.conf 2007-06-15 14:30:41 UTC 
(rev 5055)
+++ GNUnet/src/applications/testing/gnunet-testing.conf 2007-06-15 21:48:58 UTC 
(rev 5056)
@@ -16,6 +16,7 @@
 [LOGGING]
 USER-LEVEL = ERROR
 ADMIN-LEVEL = ERROR
+DEVELOPER = NO
 
 [MODULES]
 sqstore = "sqstore_sqlite"
@@ -35,19 +36,24 @@
 MAXCPULOAD             = 100
 
 [TCP]
-PORT = 2086
+PORT = 12086
+UPNP = NO
 
 [HTTP]
-PORT = 1080
+PORT = 11080
+UPNP = NO
 
 [UDP]
-PORT = 2086
+PORT = 12086
+UPNP = NO
 
 [TCP6]
-PORT = 2088
+PORT = 12088
+UPNP = NO
 
 [UDP6]
-PORT = 2088
+PORT = 12088
+UPNP = NO
 
 
 

Modified: GNUnet/src/applications/testing/testing.c
===================================================================
--- GNUnet/src/applications/testing/testing.c   2007-06-15 14:30:41 UTC (rev 
5055)
+++ GNUnet/src/applications/testing/testing.c   2007-06-15 21:48:58 UTC (rev 
5056)
@@ -302,7 +302,7 @@
          ret = OK;
          break;
        }
-       PTHREAD_SLEEP(2 * cronSECONDS);
+       PTHREAD_SLEEP(100 * cronMILLIS);
       }
       FREENONNULL(h1);
       FREENONNULL(h2);

Modified: GNUnet/src/transports/tcp.c
===================================================================
--- GNUnet/src/transports/tcp.c 2007-06-15 14:30:41 UTC (rev 5055)
+++ GNUnet/src/transports/tcp.c 2007-06-15 21:48:58 UTC (rev 5056)
@@ -112,7 +112,7 @@
                          ip);
   MUTEX_UNLOCK(tcpblacklistlock);
 #if DEBUG_TCP
-  if (ret != OK)
+  if (ret != NO)
     GE_LOG(ectx,
           GE_DEBUG | GE_ADMIN | GE_BULK,
           "Rejecting connection from address %u.%u.%u.%u (blacklisted)\n",
@@ -146,13 +146,13 @@
 #endif
     return SYSERR;
   }
-  ret = OK;
+  ret = YES;
   MUTEX_LOCK(tcpblacklistlock);
   if (allowedNetworks_ != NULL)
     ret = check_ipv4_listed(allowedNetworks_,
                            ip);
   MUTEX_UNLOCK(tcpblacklistlock);
-  if (ret != OK) {
+  if (ret != YES) {
 #if DEBUG_TCP
     GE_LOG(ectx,
           GE_DEBUG | GE_ADMIN | GE_BULK,
@@ -165,7 +165,7 @@
 
 static int isRejected(const void * addr,
                      unsigned int addr_len) {
-  if ((YES == isBlacklisted(addr,
+  if ((NO != isBlacklisted(addr,
                            addr_len)) ||
       (YES != isWhitelisted(addr,
                            addr_len))) 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]