[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18382 - in gnunet/src: ats core dht fs mesh testing transp
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18382 - in gnunet/src: ats core dht fs mesh testing transport vpn |
|
Date: |
Tue, 29 Nov 2011 18:13:57 +0100 |
Author: bartpolot
Date: 2011-11-29 18:13:57 +0100 (Tue, 29 Nov 2011)
New Revision: 18382
Modified:
gnunet/src/ats/ats.conf
gnunet/src/ats/ats_api.c
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/core/core.conf
gnunet/src/core/test_core_api_data.conf
gnunet/src/core/test_core_api_send_to_self.conf
gnunet/src/core/test_core_defaults.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
gnunet/src/core/test_core_quota_compliance.c
gnunet/src/core/test_core_quota_peer1.conf
gnunet/src/core/test_core_quota_peer2.conf
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_multipeer_data.conf
gnunet/src/dht/test_dht_twopeer_data.conf
gnunet/src/fs/fs_test_lib_data.conf
gnunet/src/fs/gnunet-service-fs_pr.c
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
gnunet/src/mesh/test_mesh.conf
gnunet/src/mesh/test_mesh_2dtorus.conf
gnunet/src/mesh/test_mesh_path.conf
gnunet/src/mesh/test_mesh_small.conf
gnunet/src/testing/test_testing_2dtorus.conf
gnunet/src/transport/test_quota_compliance.c
gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_wlan_peer1.conf
gnunet/src/transport/test_transport_api_wlan_peer2.conf
gnunet/src/vpn/test-conf.conf
Log:
Changed quota configuration from core to ats section, renamed from
TOTAL_QUOTA_* to WAN_QUOTA_*
Modified: gnunet/src/ats/ats.conf
===================================================================
--- gnunet/src/ats/ats.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/ats/ats.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -11,8 +11,8 @@
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
# ATS options
DUMP_MLP = NO
DUMP_SOLUTION = NO
Modified: gnunet/src/ats/ats_api.c
===================================================================
--- gnunet/src/ats/ats_api.c 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/ats/ats_api.c 2011-11-29 17:13:57 UTC (rev 18382)
@@ -341,9 +341,9 @@
atc->alloc_cb_cls = alloc_cb_cls;
atc->peers = GNUNET_CONTAINER_multihashmap_create (256);
atc->notify_map = GNUNET_CONTAINER_multihashmap_create (256);
- GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_OUT",
&atc->total_bps_out);
- GNUNET_CONFIGURATION_get_value_size (cfg, "core", "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats", "WAN_QUOTA_IN",
&atc->total_bps_in);
return atc;
}
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2011-11-29 16:47:44 UTC
(rev 18381)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2011-11-29 17:13:57 UTC
(rev 18382)
@@ -76,9 +76,9 @@
static struct GNUNET_CONTAINER_MultiHashMap *addresses;
-static unsigned long long total_quota_in;
+static unsigned long long wan_quota_in;
-static unsigned long long total_quota_out;
+static unsigned long long wan_quota_out;
static unsigned int active_addr_count;
@@ -100,8 +100,8 @@
if (GNUNET_YES != aa->active)
return GNUNET_OK;
GNUNET_assert (active_addr_count > 0);
- aa->assigned_bw_in.value__ = htonl (total_quota_in / active_addr_count);
- aa->assigned_bw_out.value__ = htonl (total_quota_out / active_addr_count);
+ aa->assigned_bw_in.value__ = htonl (wan_quota_in / active_addr_count);
+ aa->assigned_bw_out.value__ = htonl (wan_quota_out / active_addr_count);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New bandwidth for peer %s is %u/%u\n",
GNUNET_i2s (&aa->peer), ntohl (aa->assigned_bw_in.value__),
ntohl (aa->assigned_bw_out.value__));
@@ -475,13 +475,13 @@
GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_size (cfg, "core",
- "TOTAL_QUOTA_IN",
- &total_quota_in));
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+ "WAN_QUOTA_IN",
+ &wan_quota_in));
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_size (cfg, "core",
- "TOTAL_QUOTA_OUT",
- &total_quota_out));
+ GNUNET_CONFIGURATION_get_value_size (cfg, "ats",
+ "WAN_QUOTA_OUT",
+ &wan_quota_out));
addresses = GNUNET_CONTAINER_multihashmap_create (128);
}
Modified: gnunet/src/core/core.conf
===================================================================
--- gnunet/src/core/core.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/core/core.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -7,9 +7,6 @@
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-# quotas are in bytes per second now!
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/core/test_core_api_data.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -5,9 +5,11 @@
[arm]
DEFAULTSERVICES = topology hostlist
+[ats]
+WAN_QUOTA_IN = 64 kiB
+WAN_QUOTA_OUT = 64 kiB
+
[core]
PORT = 2092
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf 2011-11-29 16:47:44 UTC
(rev 18381)
+++ gnunet/src/core/test_core_api_send_to_self.conf 2011-11-29 17:13:57 UTC
(rev 18382)
@@ -9,11 +9,11 @@
[core]
PORT = 24512
-TOTAL_QUOTA_IN = 104857600
-TOTAL_QUOTA_OUT = 104757600
UNIXPATH = /tmp/gnunet-service-core.sock
[ats]
+WAN_QUOTA_IN = 104857600
+WAN_QUOTA_OUT = 104757600
PORT = 24571
UNIXPATH = /tmp/gnunet-p1-service-ats.sock
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/core/test_core_defaults.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -14,11 +14,13 @@
EXTERNAL_ADDRESS = 127.0.0.1
USE_LOCALADDR = NO
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
PORT = 12470
UNIXPATH = /tmp/gnunet-p1-service-core.sock
-TOTAL_QUOTA_IN = 655360000
-TOTAL_QUOTA_OUT = 655360000
[transport-tcp]
BINDTO = 127.0.0.1
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -26,10 +26,12 @@
PORT = 12485
UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 1 MB
+WAN_QUOTA_OUT = 1 MB
+
[core]
PORT = 12490
-TOTAL_QUOTA_IN = 1000000
-TOTAL_QUOTA_OUT = 1000000
UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock
DEBUG = NO
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -28,12 +28,11 @@
[core]
PORT = 22490
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock
DEBUG = NO
[ats]
PORT = 22491
UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock
-
+WAN_QUOTA_IN = 10 kiB
+WAN_QUOTA_OUT = 10 kiB
\ No newline at end of file
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -26,10 +26,12 @@
PORT = 12485
UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 10240
+WAN_QUOTA_OUT = 10240
+
[core]
PORT = 12490
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock
DEBUG = NO
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -28,8 +28,6 @@
[core]
PORT = 22490
-TOTAL_QUOTA_IN = 1000000
-TOTAL_QUOTA_OUT = 1000000
UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock
DEBUG = NO
@@ -37,4 +35,5 @@
[ats]
PORT = 22491
UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock
-
+WAN_QUOTA_IN = 1 MB
+WAN_QUOTA_OUT = 1 MB
Modified: gnunet/src/core/test_core_quota_compliance.c
===================================================================
--- gnunet/src/core/test_core_quota_compliance.c 2011-11-29 16:47:44 UTC
(rev 18381)
+++ gnunet/src/core/test_core_quota_compliance.c 2011-11-29 17:13:57 UTC
(rev 18382)
@@ -629,20 +629,20 @@
GNUNET_assert (test != -1);
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE",
- "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_IN",
¤t_quota_p1_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE",
- "TOTAL_QUOTA_IN",
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_IN",
¤t_quota_p2_in));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p1.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS",
+ "WAN_QUOTA_OUT",
¤t_quota_p1_out));
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONFIGURATION_get_value_size (p2.cfg, "CORE",
- "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS",
+ "WAN_QUOTA_OUT",
¤t_quota_p2_out));
p1.ch =
Modified: gnunet/src/core/test_core_quota_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer1.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/core/test_core_quota_peer1.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -26,10 +26,12 @@
PORT = 12475
UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock
+[ats]
+WAN_QUOTA_IN = 10240
+WAN_QUOTA_OUT = 10240
+
[core]
PORT = 12480
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock
DEBUG = NO
Modified: gnunet/src/core/test_core_quota_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer2.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/core/test_core_quota_peer2.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -28,12 +28,11 @@
[core]
PORT = 22480
-TOTAL_QUOTA_IN = 10240
-TOTAL_QUOTA_OUT = 10240
UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock
DEBUG = NO
[ats]
PORT = 22482
UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock
-
+WAN_QUOTA_IN = 10 kiB
+WAN_QUOTA_OUT = 10 kiB
\ No newline at end of file
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -36,9 +36,11 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
AUTOSTART = YES
PORT = 10003
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/dht/test_dht_api_data.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -20,9 +20,11 @@
FRIENDS-ONLY = NO
MINIMUM-FRIENDS = 0
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1GB
+
[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
PORT = 2092
[dht]
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -28,9 +28,11 @@
NEIGHBOUR_LIMIT = 50
PORT = 12365
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
PORT = 12092
[arm]
Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -45,9 +45,11 @@
[DHTLOG]
PLUGIN = mysql_dump
+[ats]
+WAN_QUOTA_IN = 1GB
+WAN_QUOTA_OUT = 1GB
+
[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-core
Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/dht/test_dht_twopeer_data.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -25,9 +25,11 @@
NEIGHBOUR_LIMIT = 50
PORT = 12365
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_OUT = 1 GB
-TOTAL_QUOTA_IN = 1 GB
HOSTNAME = localhost
PORT = 12092
Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/fs/fs_test_lib_data.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -2,9 +2,9 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-fs-test-lib/
-[core]
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
+[ats]
+WAN_QUOTA_IN = 3932160
+WAN_QUOTA_OUT = 3932160
[datastore]
QUOTA = 2 GB
Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/fs/gnunet-service-fs_pr.c 2011-11-29 17:13:57 UTC (rev
18382)
@@ -1587,13 +1587,13 @@
"MAX_PENDING_REQUESTS");
}
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "core", "TOTAL_QUOTA_OUT",
+ GNUNET_CONFIGURATION_get_value_size (GSF_cfg, "ats", "WAN_QUOTA_OUT",
&bps))
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_
("Configuration fails to specify `%s', assuming default
value."),
- "TOTAL_QUOTA_IN");
+ "WAN_QUOTA_OUT");
bps = 65536;
}
/* queue size should be #queries we can have pending and satisfy within
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/fs/test_fs_defaults.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -42,11 +42,13 @@
PORT = 43469
HOSTNAME = localhost
+[ats]
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
+
[core]
PORT = 43470
HOSTNAME = localhost
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
[fs]
PORT = 43471
Modified: gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2011-11-29
16:47:44 UTC (rev 18381)
+++ gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2011-11-29
17:13:57 UTC (rev 18382)
@@ -4,6 +4,6 @@
DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
-[core]
-TOTAL_QUOTA_IN = 3932160
-TOTAL_QUOTA_OUT = 3932160
+[ats]
+WAN_QUOTA_IN = 3932160
+WAN_QUOTA_OUT = 3932160
Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/mesh/test_mesh.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -36,9 +36,11 @@
NEIGHBOUR_LIMIT = 50
PORT = 12365
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
PORT = 12092
[arm]
Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -39,9 +39,11 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_IN = 999111999
-TOTAL_QUOTA_OUT = 999111999
AUTOSTART = YES
PORT = 10003
Modified: gnunet/src/mesh/test_mesh_path.conf
===================================================================
--- gnunet/src/mesh/test_mesh_path.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/mesh/test_mesh_path.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -36,9 +36,11 @@
NEIGHBOUR_LIMIT = 50
PORT = 12365
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
[core]
-TOTAL_QUOTA_OUT = 3932160
-TOTAL_QUOTA_IN = 3932160
PORT = 12092
[arm]
Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf 2011-11-29 16:47:44 UTC (rev
18381)
+++ gnunet/src/mesh/test_mesh_small.conf 2011-11-29 17:13:57 UTC (rev
18382)
@@ -39,9 +39,11 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
AUTOSTART = YES
PORT = 10003
Modified: gnunet/src/testing/test_testing_2dtorus.conf
===================================================================
--- gnunet/src/testing/test_testing_2dtorus.conf 2011-11-29 16:47:44 UTC
(rev 18381)
+++ gnunet/src/testing/test_testing_2dtorus.conf 2011-11-29 17:13:57 UTC
(rev 18382)
@@ -39,9 +39,11 @@
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
+
[core]
-TOTAL_QUOTA_IN = 1 GB
-TOTAL_QUOTA_OUT = 1 GB
AUTOSTART = YES
PORT = 10003
Modified: gnunet/src/transport/test_quota_compliance.c
===================================================================
--- gnunet/src/transport/test_quota_compliance.c 2011-11-29 16:47:44 UTC
(rev 18381)
+++ gnunet/src/transport/test_quota_compliance.c 2011-11-29 17:13:57 UTC
(rev 18382)
@@ -484,13 +484,9 @@
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",
+ GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "WAN_QUOTA_IN",
quota_in);
- GNUNET_CONFIGURATION_set_value_number (cfg, "ats", "TOTAL_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);
Modified:
gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_http_nat_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified:
gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_http_nat_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified:
gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_https_nat_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified:
gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_https_nat_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2011-11-29 17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer1.conf 2011-11-29
16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_wlan_peer1.conf 2011-11-29
17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/transport/test_transport_api_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer2.conf 2011-11-29
16:47:44 UTC (rev 18381)
+++ gnunet/src/transport/test_transport_api_wlan_peer2.conf 2011-11-29
17:13:57 UTC (rev 18382)
@@ -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
Modified: gnunet/src/vpn/test-conf.conf
===================================================================
--- gnunet/src/vpn/test-conf.conf 2011-11-29 16:47:44 UTC (rev 18381)
+++ gnunet/src/vpn/test-conf.conf 2011-11-29 17:13:57 UTC (rev 18382)
@@ -154,6 +154,10 @@
# REJECT_FROM6 =
# PREFIX =
+[ats]
+WAN_QUOTA_IN = 64 kiB
+WAN_QUOTA_OUT = 64 kiB
+
[core]
AUTOSTART = YES
PORT = 2092
@@ -163,9 +167,6 @@
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-# quotas are in bytes per second now!
-TOTAL_QUOTA_IN = 65536
-TOTAL_QUOTA_OUT = 65536
UNIXPATH = /tmp/gnunet-service-core.sock
# DEBUG = YES
# USERNAME =
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18382 - in gnunet/src: ats core dht fs mesh testing transport vpn,
gnunet <=