changes

diff --git a/src/transport/ats_benchmark.sh b/src/transport/ats_benchmark.sh
index 5c7ed2f38afb01ccc0fb34251283afe43904f098..f2df8a879af8b4257587be10aaefa05fd8c6758b 100755 (executable)
--- a/src/transport/ats_benchmark.sh
+++ b/src/transport/ats_benchmark.sh
@@ -1,6 +1,7 @@
 #/bin/bash
 start=1
 end=500
+rm test.ats
 
 if [ ! $1 = "" ]; then
   start=$1
@@ -20,5 +21,6 @@ do
   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

diff --git a/src/transport/test_transport_ats.conf b/src/transport/test_transport_ats.conf
index 9159a4c59656d6297dd0f36030d2c16b2d128f90..cb3ab0166705492cdeabce0990cf7ad62f7b7ce4 100644 (file)
--- a/src/transport/test_transport_ats.conf
+++ b/src/transport/test_transport_ats.conf
@@ -7,7 +7,7 @@ PORT = 2564
 
 [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 @@ PLUGINS = udp tcp
 #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,7 +28,17 @@ DEFAULTSERVICES = core
 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

diff --git a/src/transport/transport.h b/src/transport/transport.h
index 4eb14c85183ce0ae039e5de40f5ee4410bf48bc4..1cc1f87295f9feb01f2bd311456a231d83e385b2 100644 (file)
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -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