[GNUnet-SVN] r14959 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-04-12 13:48:10 +0200 (Tue, 12 Apr 2011)
New Revision: 14959

Modified:
   gnunet/src/transport/ats_benchmark.sh
   gnunet/src/transport/test_transport_ats.conf
   gnunet/src/transport/transport.h
Log:
changes


Modified: gnunet/src/transport/ats_benchmark.sh
===================================================================
--- gnunet/src/transport/ats_benchmark.sh       2011-04-12 11:43:32 UTC (rev 
14958)
+++ gnunet/src/transport/ats_benchmark.sh       2011-04-12 11:48:10 UTC (rev 
14959)
@@ -1,6 +1,7 @@
 #/bin/bash
 start=1
 end=500
+rm test.ats
 
 if [ ! $1 = "" ]; then
   start=$1
@@ -20,5 +21,6 @@
   killall -s 31 gnunet-service-core 2> /dev/null
   killall -s 31 gnunet-service-peerinfo 2> /dev/null
   #sleep 1
-  ./test_transport_ats $c
+  echo "$c peers"
+  ./test_transport_ats $c 2>> test.ats
 done

Modified: gnunet/src/transport/test_transport_ats.conf
===================================================================
--- gnunet/src/transport/test_transport_ats.conf        2011-04-12 11:43:32 UTC 
(rev 14958)
+++ gnunet/src/transport/test_transport_ats.conf        2011-04-12 11:48:10 UTC 
(rev 14959)
@@ -7,7 +7,7 @@
 
 [transport]
 PORT = 2565
-PLUGINS = udp tcp
+PLUGINS = tcp
 #DEBUG = YES
 #PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
 #PREFIX = valgrind --tool=memcheck --log-file=logs%p
@@ -17,7 +17,7 @@
 #LAN_BW_LIMIT_UP = 100000000
 #WLAN_ENERGY_DOWN_LIMIT = 0
 #WLAN_ENERGY_UP_LIMIT = 30
-#DUMP_MLP = NO
+#DUMP_MLP = YES
 #DUMP_SOLUTION = YES
 
 [arm]
@@ -28,8 +28,18 @@
 PORT = 2567
 
 [transport-tcp]
-PORT = 2568
+DISABLEV6 = YES
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+ALLOW_NAT = NO
+ENABLE_UPNP = NO
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
 
+[transport-unix]
+PORT = 2572
+
+
 [transport-udp]
 PORT = 2571
 

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2011-04-12 11:43:32 UTC (rev 14958)
+++ gnunet/src/transport/transport.h    2011-04-12 11:48:10 UTC (rev 14959)
@@ -31,8 +31,8 @@
 #include "gnunet_transport_service.h"
 
 /* Minimum time between to calculations*/
-#define ATS_MIN_INTERVAL  
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1000)
-#define ATS_EXEC_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1500)
+#define ATS_MIN_INTERVAL  
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1)
+#define ATS_EXEC_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2)
 #define ATS_MAX_EXEC_DURATION 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 100)
 #define ATS_MAX_ITERATIONS INT_MAX