improved quota loading + requesting and stopping address suggestions

2 files changed, 24 insertions, 12 deletions

diff --git a/src/ats/experiments/example.exp b/src/ats/experiments/example.exp
index da2ca0342..1edd83cfd 100644
--- a/src/ats/experiments/example.exp
+++ b/src/ats/experiments/example.exp
@@ -4,7 +4,7 @@
  slaves = 2
  max_duration = 15 s
  log_freq = 1000 ms
- cfg_file = gnunet_ats_sim_default.conf
+ cfg_file = experiments/gnunet_ats_sim_default.conf
  
 [episode-0]
 # operations = address_add, address_del, start_set_property, stop_set_property, 
@@ -60,10 +60,10 @@ op-1-address-id = 1
 op-1-peer-id = 1
 op-1-pref = BANDWIDTH  
 
-op-2-operation = stop_set_property
-op-2-address-id = 0
-op-2-peer-id = 0
-op-2-property = UTILIZATION_UP
+#op-2-operation = stop_set_property
+#op-2-address-id = 0
+#op-2-peer-id = 0
+#op-2-property = UTILIZATION_UP
 
-op-3-operation = stop_request
-op-3-peer-id = 0  
\ No newline at end of file
+op-2-operation = stop_request
+op-2-peer-id = 0  
\ No newline at end of file
diff --git a/src/ats/experiments/gnunet_ats_sim_default.conf b/src/ats/experiments/gnunet_ats_sim_default.conf
index ca95eb923..14e0a2e0b 100644
--- a/src/ats/experiments/gnunet_ats_sim_default.conf
+++ b/src/ats/experiments/gnunet_ats_sim_default.conf
@@ -1,6 +1,18 @@
-@INLINE@ template_perf_ats.conf
-[transport]
-plugins = unix
-
 [ats]
-MODE = PROPORTIONAL
+UNSPECIFIED_QUOTA_IN = 64 KiB
+UNSPECIFIED_QUOTA_OUT = 64 KiB
+# LOOPBACK
+LOOPBACK_QUOTA_IN = 64 KiB
+LOOPBACK_QUOTA_OUT = 64 KiB
+# LAN
+LAN_QUOTA_IN = 64 KiB
+LAN_QUOTA_OUT = 64 KiB
+# WAN
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+# WLAN
+WLAN_QUOTA_IN = 64 KiB
+WLAN_QUOTA_OUT = 64 KiB
+# BLUETOOTH
+BLUETOOTH_QUOTA_IN = 64 KiB
+BLUETOOTH_QUOTA_OUT = 64 KiB