17 files changed, 89 insertions, 113 deletions

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index c156d483f..142d4de25 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -281,7 +281,6 @@ check_PROGRAMS = \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
- test_quota_compliance_udp_asymmetric \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
@@ -320,7 +319,6 @@ TESTS = \
  test_quota_compliance_tcp \
  test_quota_compliance_tcp_asymmetric \
  test_quota_compliance_udp \
- test_quota_compliance_udp_asymmetric \
  $(UNIX_QUOTA_TEST) \
  $(HTTP_QUOTA_TEST) \
  $(HTTPS_QUOTA_TEST) \
@@ -646,14 +644,6 @@ test_quota_compliance_udp_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/transport/libgnunettransporttesting.la
 
-test_quota_compliance_udp_asymmetric_SOURCES = \
- test_quota_compliance.c
-test_quota_compliance_udp_asymmetric_LDADD = \
- $(top_builddir)/src/transport/libgnunettransport.la \
- $(top_builddir)/src/hello/libgnunethello.la \
- $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/transport/libgnunettransporttesting.la
-
 test_quota_compliance_unix_SOURCES = \
  test_quota_compliance.c
 test_quota_compliance_unix_LDADD = \
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 2eacbd765..ec4b9a8db 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -36,7 +36,7 @@
 #include "transport.h"
 #include "transport-testing.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define VERBOSE_ARM GNUNET_EXTRA_LOGGING
 
@@ -52,7 +52,7 @@
  */
 #define TIMEOUT_TRANSMIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
 
-#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 static char *test_source;
 
@@ -90,6 +90,7 @@ struct GNUNET_TRANSPORT_TESTING_handle * tth;
 
 static GNUNET_TRANSPORT_TESTING_ConnectRequest cc;
 
+
 /*
  * Testcase specific declarations
  */
@@ -497,13 +498,13 @@ run_measurement (unsigned long long p1_quota_in, unsigned long long p1_quota_out
       "Generated config file `%s'\n",
       gen_cfg_p2);
 
-  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1,
+  p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
                                             &notify_receive,
                                             &notify_connect, &notify_disconnect,
                                             &start_cb,
                                             NULL);
 
-  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2,
+  p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
                                             &notify_receive,
                                             &notify_connect, &notify_disconnect,
                                             &start_cb,
@@ -632,7 +633,7 @@ main (int argc, char *argv[])
 
   GNUNET_TRANSPORT_TESTING_done (tth);
 
-  return ret;
+  return test_failed;
 }
 
 
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 872a75365..06d0e275d 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1
 DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-http]
 PORT = 4010
 DEBUG = NO
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 256dc61eb..d3a039cfa 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-http]
 PORT = 3010
 DEBUG = NO
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 47f93096c..8859304bb 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-https]
 PORT = 4001
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index 79bf0331f..afe4824bd 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-https]
 PORT = 3001
 CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index ff63514b1..47f6a639c 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -1,7 +1,11 @@
 @INLINE@ template_cfg_peer1.conf
 [PATHS]
 SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
-DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
+DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
+
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
 
 [transport-tcp]
 PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index 608c49a07..d9c182be5 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -1,32 +1,34 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
+SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
+DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
 
-[transport-tcp]
-PORT = 3094
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
 
-[transport-udp]
-PORT = 3094
+[transport-tcp]
+PORT = 12015
+TIMEOUT = 5000
 
 [arm]
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock
+PORT = 12014
+DEFAULTSERVICES = transport
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [statistics]
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
+PORT = 12013
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [resolver]
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
+PORT = 12012
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
+PORT = 12011
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [transport]
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock
-
+PORT = 12010
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index ff63514b1..f92d9cd98 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
 DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-tcp]
 PORT = 4094
 
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 608c49a07..5fe5d070e 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,32 +1,34 @@
 @INLINE@ template_cfg_peer2.conf
 [PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
+SERVICEHOME = /tmp/test-transport/api-tcp-p2/
 DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
 
-[transport-tcp]
-PORT = 3094
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
 
-[transport-udp]
-PORT = 3094
+[transport-tcp]
+PORT = 12015
+TIMEOUT = 5000
 
 [arm]
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock
+PORT = 12014
+DEFAULTSERVICES = transport
+UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
 [statistics]
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
+PORT = 12013
+UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 
 [resolver]
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
+PORT = 12012
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
+PORT = 12011
+UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
 
 [transport]
-PORT = 3091
-UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock
-
+PORT = 12010
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 
diff --git a/src/transport/test_quota_compliance_udp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_udp_asymmetric_peer1.conf
deleted file mode 100644
index 4848b065e..000000000
--- a/src/transport/test_quota_compliance_udp_asymmetric_peer1.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
-
-[transport-udp]
-PORT = 4368
-MAX_BPS = 50000000
-
-[arm]
-PORT = 4087
-UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock
-
-[statistics]
-PORT = 4088
-UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock
-
-[resolver]
-PORT = 4089
-UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock
-
-[peerinfo]
-PORT = 4090
-UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock
-
-[transport]
-PORT = 4091
-PLUGINS = udp
-UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock
-
diff --git a/src/transport/test_quota_compliance_udp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_udp_asymmetric_peer2.conf
deleted file mode 100644
index 4b58c934f..000000000
--- a/src/transport/test_quota_compliance_udp_asymmetric_peer2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-@INLINE@ template_cfg_peer2.conf
-[PATHS]
-SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
-
-[transport-udp]
-PORT = 3368
-MAX_BPS = 50000000
-
-[arm]
-PORT = 3087
-UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock
-
-[statistics]
-PORT = 3088
-UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock
-
-[resolver]
-PORT = 3089
-UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock
-
-[peerinfo]
-PORT = 3090
-UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock
-
-[transport]
-PORT = 3091
-PLUGINS = udp
-UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock
-
-
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 4848b065e..3e52c2167 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -1,8 +1,12 @@
-@INLINE@ template_cfg_peer2.conf
+@INLINE@ template_cfg_peer1.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-udp]
 PORT = 4368
 MAX_BPS = 50000000
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index 4b58c934f..d6d928f7c 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,8 +1,14 @@
 @INLINE@ template_cfg_peer2.conf
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-udp]
 PORT = 3368
 MAX_BPS = 50000000
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
index fa24517ee..a2d1bdd18 100644
--- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
@@ -1,4 +1,4 @@
-@INLINE@ template_cfg_peer1.conf
+@INLINE@ template_cfg_peer2.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 60e656bad..20844227a 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test_quota_compliance_peer1/
 DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-unix]
 PORT = 12120
 
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 42db979a2..332226a84 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -1,8 +1,12 @@
-@INLINE@ template_cfg_peer1.conf
+@INLINE@ template_cfg_peer2.conf
 [PATHS]
 SERVICEHOME = /tmp/test_quota_compliance_peer2
 DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
 
+[core]
+TOTAL_QUOTA_IN = 10000
+TOTAL_QUOTA_OUT = 10000
+
 [transport-unix]
 PORT = 12136