fix ats config

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 883ac7fa20e5377d29c8b76b06ba8bf0313df145..5ecffee0e2d39eec717056691220f2d40e358226 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -86,7 +86,17 @@ TIMEOUT = 5000
 # ACCEPT_FROM6 =
 # REJECT_FROM =
 # REJECT_FROM6 =
-# BINDTO = 
+# BINDTO =
+
+# ATS options
+DUMP_MLP = NO
+DUMP_SOLUTION = NO
+DUMP_OVERWRITE = NO 
+DUMP_MIN_PEERS = 0
+DUMP_MIN_ADDRS = 0
+DUMP_OVERWRITE = 0
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
 
 
 [transport-udp]

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 6676154f22d7c54c4f7eca0dbfbb4fd34534d70c..ee18c9ba097a09245ee87594d74c7e898d3d76b4 100644 (file)
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -6719,59 +6719,43 @@ run (void *cls,
   int minimum_peers = 0;
   int minimum_addresses = 0;
 
-  if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MLP"))
-    log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                             "transport","DUMP_MLP");
-
-  if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_SOLUTION"))
-    log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                  "transport","DUMP_SOLUTION");
-  if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_OVERWRITE"))
-    overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg,
-                                  "transport","DUMP_OVERWRITE");
-  if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "DUMP_MIN_PEERS"))
-  {
-          GNUNET_CONFIGURATION_get_value_number(cfg,
-              "transport","DUMP_MIN_PEERS", &value);
-          minimum_peers = value;
-  }
-  if (GNUNET_CONFIGURATION_have_value(cfg,
-      "transport", "DUMP_MIN_ADDRS"))
-  {
-      GNUNET_CONFIGURATION_get_value_number(cfg,
-        "transport","DUMP_MIN_ADDRS", &value);
-      minimum_addresses= value;
-  }
-  if (GNUNET_CONFIGURATION_have_value(cfg,
-      "transport", "DUMP_OVERWRITE"))
-  {
-      GNUNET_CONFIGURATION_get_value_number(cfg,
-          "transport","DUMP_OVERWRITE", &value);
-      overwrite_dump = value;
-  }
-
-  if (GNUNET_CONFIGURATION_have_value(cfg,
-      "transport", "ATS_MIN_INTERVAL"))
-  {
+  log_problem = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                                     "transport",
+                                                     "DUMP_MLP");
+  log_solution = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                                      "transport",
+                                                      "DUMP_SOLUTION");
+  overwrite_dump = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                                        "transport",
+                                                        "DUMP_OVERWRITE");
+  if (GNUNET_OK ==
       GNUNET_CONFIGURATION_get_value_number(cfg,
-          "transport","ATS_MIN_INTERVAL", &value);
-      ats_minimum_interval.rel_value = value;
-  }
-
-  if (GNUNET_CONFIGURATION_have_value(cfg,
-      "transport", "ATS_EXEC_INTERVAL"))
-  {
+                                           "transport",
+                                           "DUMP_MIN_PEERS", 
+                                           &value))
+    minimum_peers = (int) value;
+  if (GNUNET_OK ==
       GNUNET_CONFIGURATION_get_value_number(cfg,
-          "transport","ATS_EXEC_INTERVAL", &value);
-      ats_regular_interval.rel_value = value;
-  }
-  if (GNUNET_CONFIGURATION_have_value(cfg, "transport", "ATS_MIN_INTERVAL"))
-  {
+                                           "transport",
+                                           "DUMP_MIN_ADDRS", 
+                                           &value))
+    minimum_addresses = (int) value;
+  if (GNUNET_OK == 
       GNUNET_CONFIGURATION_get_value_number(cfg,
-          "transport","ATS_MIN_INTERVAL", &value);
-      ats_minimum_interval.rel_value = value;
-  }
-
+                                           "transport",
+                                           "DUMP_OVERWRITE",
+                                           &value))
+    overwrite_dump = (int) value;
+  GNUNET_break (GNUNET_OK ==
+               GNUNET_CONFIGURATION_get_value_time (cfg,
+                                                    "transport",
+                                                    "ATS_EXEC_INTERVAL", 
+                                                    &ats_regular_interval));
+  GNUNET_break (GNUNET_OK ==
+               GNUNET_CONFIGURATION_get_value_time (cfg,
+                                                    "transport",
+                                                    "ATS_MIN_INTERVAL", 
+                                                    &ats_minimum_interval));
   ats_set_logging_options (ats,
                           minimum_addresses,
                           minimum_peers,