From 997b15e1ae4584d7169eae5e9a39dd3be1bce35a Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 14 Oct 2011 16:12:48 +0000 Subject: updating configs for ats --- src/transport/template_cfg_peer1.conf | 5 ++++- src/transport/template_cfg_peer2.conf | 5 ++++- src/transport/test_quota_compliance_http_peer1.conf | 2 +- src/transport/test_quota_compliance_http_peer2.conf | 2 +- src/transport/test_quota_compliance_https_peer1.conf | 2 +- src/transport/test_quota_compliance_https_peer2.conf | 2 +- src/transport/test_quota_compliance_tcp_peer1.conf | 2 +- src/transport/test_quota_compliance_tcp_peer2.conf | 2 +- src/transport/test_quota_compliance_udp_peer1.conf | 2 +- src/transport/test_quota_compliance_udp_peer2.conf | 2 +- src/transport/test_quota_compliance_unix_peer1.conf | 2 +- src/transport/test_quota_compliance_unix_peer2.conf | 2 +- src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | 2 +- src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | 2 +- src/transport/test_transport_api_tcp_nat_peer1.conf | 2 +- src/transport/test_transport_api_tcp_peer1.conf | 2 +- src/transport/test_transport_api_tcp_peer2.conf | 2 +- src/transport/test_transport_api_timeout_tcp_peer1.conf | 2 +- src/transport/test_transport_api_timeout_tcp_peer2.conf | 2 +- src/transport/test_transport_api_udp_nat_peer1.conf | 1 + src/transport/test_transport_api_udp_nat_peer2.conf | 2 +- src/transport/test_transport_api_udp_peer1.conf | 2 +- src/transport/test_transport_api_udp_peer2.conf | 2 +- src/transport/test_transport_api_unix_peer1.conf | 2 +- src/transport/test_transport_api_unix_peer2.conf | 2 +- .../test_transport_api_unreliability_constant_udp_peer1.conf | 2 +- .../test_transport_api_unreliability_constant_udp_peer2.conf | 2 +- src/transport/test_transport_api_unreliability_udp_peer1.conf | 2 +- src/transport/test_transport_api_unreliability_udp_peer2.conf | 2 +- src/transport/test_transport_api_unreliability_unix_peer1.conf | 2 +- src/transport/test_transport_api_unreliability_unix_peer2.conf | 2 +- src/transport/test_transport_api_unreliability_wlan_peer1.conf | 2 +- src/transport/test_transport_api_unreliability_wlan_peer2.conf | 2 +- src/transport/test_transport_api_wlan_peer1.conf | 2 +- src/transport/test_transport_api_wlan_peer2.conf | 2 +- 35 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index d724a6e8b..35007677f 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf @@ -28,4 +28,7 @@ UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock PORT = 12001 UNIXPATH = /tmp/gnunet-p1-service-transport.sock - +[ats] +#DEBUG = YES +PORT = 12006 +UNIXPATH = /tmp/gnunet-p1-service-ats.sock \ No newline at end of file diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index a086a2408..b0644c5b2 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -29,4 +29,7 @@ TRUST = $SERVICEHOME/data/credit/ PORT = 12010 UNIXPATH = /tmp/gnunet-p2-service-transport.sock - +[ats] +#DEBUG = YES +PORT = 12016 +UNIXPATH = /tmp/gnunet-p2-service-ats.sock \ No newline at end of file diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 3b45c8908..5793bef63 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ @INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1 DEFAULTCONFIG = test_quota_compliance_http_peer1.conf diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 747c92114..256dc61eb 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 692077c55..47f93096c 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_https_peer1.conf diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 0d22f9c78..79bf0331f 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index 99b8311ee..ff63514b1 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 11457d0ac..608c49a07 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index c524966d2..4848b065e 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index ca590cfc6..4b58c934f 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index 0952b739f..f562d4c1a 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index 86c6701ba..b444cb48c 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf index beae8c210..2ab9c8218 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf index feb49770a..366ed186c 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 669d742bd..7e191dc51 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 7424f5e6f..2df5a6175 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-p1/ DEFAULTCONFIG = test_transport_api_tcp_peer1.conf diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 84adbdc38..04500ea17 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-p2/ DEFAULTCONFIG = test_transport_api_tcp_peer2.conf diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index d724a6e8b..09c6304cf 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-p1/ DEFAULTCONFIG = template_cfg_peer1.conf diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index 87503f61c..caa7cea62 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-p2/ DEFAULTCONFIG = template_cfg_peer2.conf diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 562e9bb1d..a07315752 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -1,3 +1,4 @@ +@INLINE@ template_cfg_peer1.conf @INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 2eb82f4bf..0852b25d9 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index b57bdee53..19e4688a3 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p1/ DEFAULTCONFIG = test_transport_api_udp_peer1.conf diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index cf54000e6..751a15ae0 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p2/ DEFAULTCONFIG = test_transport_api_udp_peer2.conf diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index c6b2d2a68..b1ace7d4c 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-unix-p1/ DEFAULTCONFIG = test_transport_api_unix_peer1.conf diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index bed415b65..30b44e51d 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-unix-p2/ DEFAULTCONFIG = test_transport_api_unix_peer2.conf diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index 233a8bbfe..24bf6cad1 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p1/ DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index d0c4483be..f45a95762 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p2/ DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 39ce7ca9a..0c868a0f6 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p1/ DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index b4dc45794..88d5dfb86 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-udp-p2/ DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index dd67bce93..23e485df4 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-unix-p1/ DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index b5d9cca34..c197c18ff 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-unix-p2/ DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index 02839dd18..dda2cc10b 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-wlan-p1/ DEFAULTCONFIG = test_transport_api_wlan_peer1.conf diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index b45c97d2f..b743bd94e 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-wlan-p2/ DEFAULTCONFIG = test_transport_api_wlan_peer2.conf diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index a9a4679ef..e379cf08c 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer1.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-wlan-p1/ DEFAULTCONFIG = test_transport_api_wlan_peer1.conf diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index ed25f1ac8..3e0ce27d6 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf @@ -1,4 +1,4 @@ -@INLINE@ test_transport_defaults.conf +@INLINE@ template_cfg_peer2.conf [PATHS] SERVICEHOME = /tmp/test-transport/api-wlan-p2/ DEFAULTCONFIG = test_transport_api_wlan_peer2.conf -- cgit v1.2.3