summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2011-11-29 17:13:57 +0000
committerBart Polot <bart@net.in.tum.de>2011-11-29 17:13:57 +0000
commit5ca85864950a1fe92613f5ed3a69cd08d248423e (patch)
tree26b44bbe805223a9ca58aa46d112bb49fad35f72 /src/transport
parentb312a0e714d1782f1258b3aaa697f8f36315cd60 (diff)
Changed quota configuration from core to ats section, renamed from TOTAL_QUOTA_* to WAN_QUOTA_*
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_quota_compliance.c8
-rw-r--r--src/transport/test_transport_api_reliability_http_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_http_nat_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_http_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_http_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_https_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_https_nat_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_https_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_https_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_nat_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_tcp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer1.conf6
-rw-r--r--src/transport/test_transport_api_reliability_wlan_peer2.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer1.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_constant_udp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer1.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_udp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer1.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_unix_peer2.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer1.conf6
-rw-r--r--src/transport/test_transport_api_unreliability_wlan_peer2.conf6
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf6
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf6
25 files changed, 74 insertions, 78 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index bb33be1e8..52051954b 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -484,13 +484,9 @@ generate_config (char *cfg_file, unsigned long long quota_in,
GNUNET_asprintf (&fname, "q_in_%llu_q_out_%llu_%s", quota_in, quota_out,
cfg_file);
GNUNET_CONFIGURATION_set_value_string (cfg, "PATHS", "DEFAULTCONFIG", fname);
- GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_OUT",
- quota_out);
- GNUNET_CONFIGURATION_set_value_number (cfg, "core", "TOTAL_QUOTA_IN",
- quota_in);
- GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_IN",
quota_in);
- GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_OUT",
quota_out);
GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_write (cfg, fname));
GNUNET_CONFIGURATION_destroy (cfg);
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 7d9d62773..2041e70a2 100644
--- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_nat_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-http-p1/
DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[nat]
BEHIND_NAT = YES
diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf
index 448667c8a..c87a25622 100644
--- a/src/transport/test_transport_api_reliability_http_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_nat_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-http-p2/
DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-http]
PORT = 12090
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index 40fc73b6b..6a6eeabb4 100644
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-http-p1/
DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[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 755d1b546..c0d8c99cc 100644
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-http-p2/
DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[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 ede7e288a..3ce6eb4c7 100644
--- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_nat_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-https-p1/
DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[nat]
BEHIND_NAT = 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 369ee152a..6b773185f 100644
--- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_nat_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-https-p2/
DEFAULTCONFIG = test_transport_api_reliability_https_nat_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-https]
PORT = 12110
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index 6079b0a40..de844c9a9 100644
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-https-p1/
DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[transport-https]
PORT = 12300
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 4c2e9959d..f005dc041 100644
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-https-p2/
DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-https]
PORT = 12310
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 2efaef33a..5832b01b2 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[nat]
BEHIND_NAT = 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 19ac0bcda..4feafb98a 100644
--- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[ats]
+WAN_QUOTA_OUT = 1 GB
+WAN_QUOTA_IN = 1 GB
[nat]
DISABLEV6 = YES
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf
index 123357e39..06658f18e 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer1.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[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 7d6aea04b..e3ec8b197 100644
--- a/src/transport/test_transport_api_reliability_tcp_peer2.conf
+++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
+[ats]
+WAN_QUOTA_OUT = 1 GB
+WAN_QUOTA_IN = 1 GB
[transport-tcp]
PORT = 12015
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf
index dda2cc10b..036f87759 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[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 b743bd94e..f86253c3b 100644
--- a/src/transport/test_transport_api_reliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-wlan]
INTERFACE = mon1
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 24bf6cad1..d785c98ac 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-udp-p1/
DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[transport-udp]
PORT = 12040
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 f45a95762..a58c1c09c 100644
--- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-udp-p2/
DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf
index 0c868a0f6..eb7e96595 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-udp-p1/
DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[transport-udp]
PORT = 12040
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf
index 88d5dfb86..7b0972bd1 100644
--- a/src/transport/test_transport_api_unreliability_udp_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-udp-p2/
DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-udp]
PORT = 12050
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf
index 23e485df4..6600e0355 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-unix-p1/
DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[arm]
PORT = 12125
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf
index c197c18ff..6344ba191 100644
--- a/src/transport/test_transport_api_unreliability_unix_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-unix-p2/
DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[arm]
PORT = 12135
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
index dda2cc10b..036f87759 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[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 b743bd94e..f86253c3b 100644
--- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf
+++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-wlan]
INTERFACE = mon1
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 685bad85c..3f870ef92 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
[transport-wlan]
INTERFACE = mon0
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 10c91e07a..917d8021f 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -3,9 +3,9 @@
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
-[core]
-TOTAL_QUOTA_OUT = 1073741824
-TOTAL_QUOTA_IN = 1073741824
+[ats]
+WAN_QUOTA_OUT = 1073741824
+WAN_QUOTA_IN = 1073741824
[transport-wlan]
INTERFACE = mon1