From 438477f091548c33f67fd609f30768151bf97aa3 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 19 Jul 2011 12:56:55 +0000
Subject: [PATCH] cleanup

---
 src/transport/gnunet-service-transport.c     | 44 ++------------------
 src/transport/gnunet-service-transport_ats.c | 42 +++++++++++++++----
 src/transport/gnunet-service-transport_ats.h |  8 +---
 3 files changed, 40 insertions(+), 54 deletions(-)

diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 9fb2dc868..31ac55d34 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -6715,35 +6715,9 @@ run (void *cls,
                   ATS_MAX_ITERATIONS, ATS_MAX_EXEC_DURATION,
                   &create_ats_information,
                   ats_result_cb);
-#endif
-
-  int log_problem = GNUNET_NO;
-  int log_solution = GNUNET_NO;
-  int overwrite_dump = GNUNET_NO;
-  int minimum_peers = 0;
-  int minimum_addresses = 0;
-
-  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",
-					    "DUMP_MIN_PEERS", 
-					    &value))
-    minimum_peers = (int) value;
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number(cfg,
-					    "transport",
-					    "DUMP_MIN_ADDRS", 
-					    &value))
-    minimum_addresses = (int) value;
+  ats_set_logging_options (ats,
+			   stats,
+			   cfg);
   GNUNET_break (GNUNET_OK ==
 		GNUNET_CONFIGURATION_get_value_time (cfg,
 						     "transport",
@@ -6754,19 +6728,9 @@ run (void *cls,
 						     "transport",
 						     "ATS_MIN_INTERVAL", 
 						     &ats_minimum_interval));
-#if HAVE_LIBGLPK
-  ats_set_logging_options (ats,
-                          stats,
-                          minimum_addresses,
-                          minimum_peers,
-                          overwrite_dump,
-                          log_solution,
-                          log_problem);
-#endif
   if (ats != NULL)
     ats_task = GNUNET_SCHEDULER_add_now (&schedule_ats, ats);
-
-
+#endif
 
 
 #if DEBUG_TRANSPORT
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index d8acb534b..df425bfb0 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -463,9 +463,9 @@ static void _dummy2 ()
 {
   ats_modify_problem_state (NULL, 0);
   qm[1].atis_index = 0;
-   _dummy();
-   int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW;
-   t = 0;
+  _dummy();
+  int t = ATS_COST_UPDATED + ATS_MODIFIED + ATS_NEW;
+  t++;
 }
 
 /*
@@ -1669,14 +1669,40 @@ void ats_update_problem_cr (struct ATS_Handle * ats)
 
 void ats_set_logging_options (struct ATS_Handle * ats,
                               struct GNUNET_STATISTICS_Handle * stats,
-                              int minimum_addresses,
-                              int minimum_peers,
-                              int overwrite_dump,
-                              int log_solution,
-                              int log_problem)
+			      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  int minimum_addresses;
+  int minimum_peers;
+  int overwrite_dump;
+  int log_solution;
+  int log_problem;
+  unsigned long long  value;
+
   if (ats == NULL)
     return;
+  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",
+					    "DUMP_MIN_PEERS", 
+					    &value))
+    minimum_peers = (int) value;
+  if (GNUNET_OK ==
+      GNUNET_CONFIGURATION_get_value_number(cfg,
+					    "transport",
+					    "DUMP_MIN_ADDRS", 
+					    &value))
+    minimum_addresses = (int) value;
+
+
   ats->stats = stats;
   ats->dump_min_addr = minimum_addresses;
   ats->dump_min_peers = minimum_peers;
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
index 0e4427dc6..2dfe5ca0a 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -504,12 +504,8 @@ ats_update_problem_cr (struct ATS_Handle * ats);
 
 void
 ats_set_logging_options (struct ATS_Handle * ats,
-                        struct GNUNET_STATISTICS_Handle *stats,
-                        int minimum_addresses,
-                        int minimum_peers,
-                        int overwrite_dump,
-                        int log_solution,
-                        int log_problem);
+			 struct GNUNET_STATISTICS_Handle *stats,
+			 const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 #endif
 /* end of file gnunet-service-transport_ats.h */
-- 
2.25.1