moving ats quotas to template files

diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 233b9b3cf39500490154c634d4442b526ba95045..ba05e9357bef4a6f9be0c9965e75cb9b616139fa 100644 (file)
--- 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 71881bdb0241ea42e90046436bacba1facda8ab1..9d0e8e55462c03181a454ca20ec59c5611cca63d 100644 (file)
--- 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 2041e70a2f8b2943a00b304da761a627309d24ca..cd841a3ca9fe5cc5ec638ee930a745c0ac27bb32 100644 (file)
--- 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 6a6eeabb4f1d4a2bf9479674f3bc8974493099f2..ebb6e436476cc2a421c27db78bb7531d8c292c23 100644 (file)
--- 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 c0d8c99cc9ba7261b21897a71ceee26c90d64c65..c21fa1d55464c90db4dc558253e2143736c36db2 100644 (file)
--- 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 3ce6eb4c79ccf4b597fd79ea74f9f5edd9e14183..ca14c720ad5c08a0edf608ab55165b5879cca750 100644 (file)
--- 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 6b773185ffd8d089e4ecb55bc3d110df48e83f61..b7c2e9769f5fd3a5aae94fd2ad7fe279e8cf5024 100644 (file)
--- 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 de844c9a93508787b36651e1f3299a889461faca..0699f69c8af305d220561c6da221b90c60058b82 100644 (file)
--- 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 f005dc04101e643b4c991a7844f6363b69bf3735..bd344abc4e631bcf97565b242f56be3ee04d5737 100644 (file)
--- 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 5832b01b2ad43fd63fc6c489c67a1e7031b4446a..2f0b3ba507e5f458b2acd981c1ca0a39a32a0fba 100644 (file)
--- 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 4feafb98a49dc7c743f89bfc2e89570b1f20a348..20ca7a0dea2f04d0fe246cba4042e55d2dc06f5b 100644 (file)
--- 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 06658f18e0a33ca1c9b5883245f7b8b7c2946958..a05165a09cb69ba79a2e72fb30d3e94a0415080e 100644 (file)
--- 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 e3ec8b197362654235e1d21ccfeffbd8e4718aab..2ceff2c3092d9633e21d6051950bb18b87da16b4 100644 (file)
--- 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 036f87759cfcc5128237711ca161889e00808098..9dd9d1bd6e6bedf01e0550d72f75b44ae7415681 100644 (file)
--- 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 f86253c3bd330af0370d2a102e92c16f42dca9cd..bc868d7d7fe459995d4f7df1ffb7810b2629faa3 100644 (file)
--- 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 d785c98ac6caba1b2e1c59ba062171224829826d..d872f02e7204b62cc2a9bed2a66a86108d02f1bd 100644 (file)
--- 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 a58c1c09cbe53ed3e6711fae5f3bac75e031ef32..50ee65acb64e231ddcbf4eb7edec39e28805ca7d 100644 (file)
--- 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 eb7e96595a04585bee6c17ff0f5cdfbec60048dc..8a5a4052ed9c022d3c8e374f2443fc6d19ace667 100644 (file)
--- 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 7b0972bd1511a8cfa12e759ca294deb910a468e2..d240c42ce14c1e4356a0731a396aae780a1b1e27 100644 (file)
--- 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 6600e035578e2ac4a93f87cff22259d234bda482..8689e415e41c158a6ce3396a12ad1658c25ad6cc 100644 (file)
--- 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 6344ba191c6689a610bb2d5764a583cfe8664823..7c3cc195387efd93349e49501ddc16e58731ca75 100644 (file)
--- 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 036f87759cfcc5128237711ca161889e00808098..9dd9d1bd6e6bedf01e0550d72f75b44ae7415681 100644 (file)
--- 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 f86253c3bd330af0370d2a102e92c16f42dca9cd..bc868d7d7fe459995d4f7df1ffb7810b2629faa3 100644 (file)
--- 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 3f870ef929d1627607d802baaeac90158a4ef413..e379cf08c9c7cf48af161bf8db7c1919d1865558 100644 (file)
--- 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 917d8021fbb904d93c94e41d8eccc1fc415d790e..3e0ce27d69e1e74c93b0b43fade54be19b702930 100644 (file)
--- 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