From cdfc9de88b24d22a2c715834fcc66f4b68b55640 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 30 Nov 2011 14:23:15 +0000 Subject: moving ats quotas to template files --- src/transport/template_cfg_peer1.conf | 4 ++++ src/transport/template_cfg_peer2.conf | 2 ++ src/transport/test_transport_api_reliability_http_nat_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_http_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_http_peer2.conf | 4 ---- src/transport/test_transport_api_reliability_https_nat_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_https_nat_peer2.conf | 4 ---- src/transport/test_transport_api_reliability_https_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_https_peer2.conf | 4 ---- src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | 4 ---- src/transport/test_transport_api_reliability_tcp_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_tcp_peer2.conf | 4 ---- src/transport/test_transport_api_reliability_wlan_peer1.conf | 4 ---- src/transport/test_transport_api_reliability_wlan_peer2.conf | 4 ---- .../test_transport_api_unreliability_constant_udp_peer1.conf | 4 ---- .../test_transport_api_unreliability_constant_udp_peer2.conf | 4 ---- src/transport/test_transport_api_unreliability_udp_peer1.conf | 4 ---- src/transport/test_transport_api_unreliability_udp_peer2.conf | 4 ---- src/transport/test_transport_api_unreliability_unix_peer1.conf | 4 ---- src/transport/test_transport_api_unreliability_unix_peer2.conf | 4 ---- src/transport/test_transport_api_unreliability_wlan_peer1.conf | 4 ---- src/transport/test_transport_api_unreliability_wlan_peer2.conf | 4 ---- src/transport/test_transport_api_wlan_peer1.conf | 4 ---- src/transport/test_transport_api_wlan_peer2.conf | 4 ---- 25 files changed, 6 insertions(+), 92 deletions(-) diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index 233b9b3cf..ba05e9357 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf @@ -42,5 +42,9 @@ UNIXPATH = /tmp/gnunet-p1-service-transport.sock [ats] #DEBUG = YES +WAN_QUOTA_IN = 1 GB +WAN_QUOTA_OUT = 1 GB PORT = 12006 UNIXPATH = /tmp/gnunet-p1-service-ats.sock + + diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index 71881bdb0..9d0e8e554 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -42,5 +42,7 @@ UNIXPATH = /tmp/gnunet-p2-service-transport.sock [ats] #DEBUG = YES +WAN_QUOTA_IN = 1 GB +WAN_QUOTA_OUT = 1 GB PORT = 12016 UNIXPATH = /tmp/gnunet-p2-service-ats.sock diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf index 2041e70a2..cd841a3ca 100644 --- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_nat_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-http-p1/ DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [nat] BEHIND_NAT = YES ENABLE_NAT_SERVER = YES diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index 6a6eeabb4..ebb6e4364 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-http-p1/ DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-tcp] TIMEOUT = 5 s diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index c0d8c99cc..c21fa1d55 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-http-p2/ DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf -[ats] -WAN_QUOTA_OUT = 1 GB -WAN_QUOTA_IN = 1 GB - [transport-http] PORT = 12190 diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf index 3ce6eb4c7..ca14c720a 100644 --- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_nat_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-https-p1/ DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [nat] BEHIND_NAT = YES ENABLE_NAT_SERVER = YES diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf index 6b773185f..b7c2e9769 100644 --- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_nat_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-https-p2/ DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-https] PORT = 12110 KEY_FILE = $SERVICEHOME/https_key_p2.key diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index de844c9a9..0699f69c8 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-https-p1/ DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-https] PORT = 12300 KEY_FILE = $SERVICEHOME/https_key_p1.key diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index f005dc041..bd344abc4 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-https-p2/ DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-https] PORT = 12310 KEY_FILE = $SERVICEHOME/https_key_p2.key 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 5832b01b2..2f0b3ba50 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [nat] BEHIND_NAT = YES ENABLE_NAT_SERVER = YES 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 4feafb98a..20ca7a0de 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf -[ats] -WAN_QUOTA_OUT = 1 GB -WAN_QUOTA_IN = 1 GB - [nat] DISABLEV6 = YES ENABLE_NAT_CLIENT = YES diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 06658f18e..a05165a09 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf @@ -2,10 +2,6 @@ [PATHS] SERVICEHOME = /tmp/test-transport/api-tcp-p1/ DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf - -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB [transport-tcp] PORT = 12000 diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index e3ec8b197..2ceff2c30 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-tcp-p2/ DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf -[ats] -WAN_QUOTA_OUT = 1 GB -WAN_QUOTA_IN = 1 GB - [transport-tcp] PORT = 12015 TIMEOUT = 5 s diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index 036f87759..9dd9d1bd6 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p1/ DEFAULTCONFIG = test_transport_api_wlan_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-wlan] TESTMODE = 1 diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index f86253c3b..bc868d7d7 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p2/ DEFAULTCONFIG = test_transport_api_wlan_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-wlan] INTERFACE = mon1 TESTMODE = 2 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 d785c98ac..d872f02e7 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-udp-p1/ DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-udp] PORT = 12040 MAX_BPS = 1073741824 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 a58c1c09c..50ee65acb 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-udp-p2/ DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-udp] PORT = 12050 MAX_BPS = 1073741824 diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index eb7e96595..8a5a4052e 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-udp-p1/ DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-udp] PORT = 12040 MAX_BPS = 5000000 diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index 7b0972bd1..d240c42ce 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-udp-p2/ DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-udp] PORT = 12050 MAX_BPS = 5000000 diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 6600e0355..8689e415e 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-unix-p1/ DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [arm] PORT = 12125 UNIXPATH = /tmp/gnunet-p1-service-arm.sock diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index 6344ba191..7c3cc1953 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-unix-p2/ DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [arm] PORT = 12135 UNIXPATH = /tmp/gnunet-p2-service-arm.sock diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index 036f87759..9dd9d1bd6 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p1/ DEFAULTCONFIG = test_transport_api_wlan_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-wlan] TESTMODE = 1 diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index f86253c3b..bc868d7d7 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p2/ DEFAULTCONFIG = test_transport_api_wlan_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-wlan] INTERFACE = mon1 TESTMODE = 2 diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 3f870ef92..e379cf08c 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p1/ DEFAULTCONFIG = test_transport_api_wlan_peer1.conf -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - [transport-wlan] INTERFACE = mon0 TESTMODE = 1 diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 917d8021f..3e0ce27d6 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf @@ -3,10 +3,6 @@ SERVICEHOME = /tmp/test-transport/api-wlan-p2/ DEFAULTCONFIG = test_transport_api_wlan_peer2.conf -[ats] -WAN_QUOTA_OUT = 1073741824 -WAN_QUOTA_IN = 1073741824 - [transport-wlan] INTERFACE = mon1 TESTMODE = 2 -- cgit v1.2.3