15 files changed, 89 insertions, 86 deletions

diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index e1340580e..19c935fbb 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -639,7 +639,7 @@ set_prop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
         pg->ats_property, prop_value, prop_value);
   }
   else
-    GAS_normalization_normalize_property (pg->test_address->ats_addr, &atsi, 1);
+    GAS_normalization_update_property (pg->test_address->ats_addr, &atsi, 1);
   sh->sf->s_bulk_stop (sh->sf->cls);
 
   pg->set_task = GNUNET_SCHEDULER_add_delayed (pg->frequency,
@@ -3010,7 +3010,7 @@ get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
     return p->pref_abs;
   }
   else
-    return GAS_normalization_get_preferences_by_peer (NULL,
+    return GAS_preference_get_by_peer (NULL,
                                                       id);
 }
 
diff --git a/src/ats/gnunet-service-ats.c b/src/ats/gnunet-service-ats.c
index 4454c59ea..ea8bb45ad 100644
--- a/src/ats/gnunet-service-ats.c
+++ b/src/ats/gnunet-service-ats.c
@@ -111,7 +111,7 @@ client_disconnect_handler (void *cls,
     return;
   GAS_scheduling_remove_client (client);
   GAS_connectivity_remove_client (client);
-  GAS_normalization_preference_client_disconnect (client);
+  GAS_preference_client_disconnect (client);
 }
 
 
@@ -127,7 +127,7 @@ cleanup_task (void *cls,
 {
   GAS_addresses_done ();
   GAS_connectivity_done ();
-  GAS_plugins_done ();
+  GAS_plugin_done ();
   GAS_normalization_stop ();
   GAS_scheduling_done ();
   GAS_performance_done ();
@@ -181,7 +181,7 @@ run (void *cls,
      sizeof (struct ReservationRequestMessage)},
     {&GAS_handle_preference_change, NULL,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE, 0},
-    {&GAS_handle_preference_feedback, NULL,
+    {&GAS_handle_feedback, NULL,
      GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_FEEDBACK, 0},
     {NULL, NULL, 0, 0}
   };
@@ -193,7 +193,7 @@ run (void *cls,
   GAS_normalization_start ();
   GAS_addresses_init (server);
   if (GNUNET_OK !=
-      GAS_plugins_init (cfg))
+      GAS_plugin_init (cfg))
   {
     GNUNET_break (0);
     GAS_addresses_done ();
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 0a35570c7..743c19436 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -646,7 +646,7 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
                                         GNUNET_BANDWIDTH_value_init (aa->assigned_bw_out),
                                         GNUNET_BANDWIDTH_value_init (aa->assigned_bw_in));
 
-    GAS_normalization_normalize_property (aa,
+    GAS_normalization_update_property (aa,
                                           atsi,
                                           atsi_count);
   }
diff --git a/src/ats/gnunet-service-ats_feedback.c b/src/ats/gnunet-service-ats_feedback.c
index e367af92c..0ffb43e13 100644
--- a/src/ats/gnunet-service-ats_feedback.c
+++ b/src/ats/gnunet-service-ats_feedback.c
@@ -48,7 +48,7 @@ preference_feedback (struct GNUNET_SERVER_Client *application,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received PREFERENCE FEEDBACK for peer `%s'\n",
               GNUNET_i2s (peer));
-  GAS_plugin_preference_feedback (application,
+  GAS_plugin_notify_feedback (application,
                                   peer,
                                   scope,
                                   kind,
@@ -64,7 +64,7 @@ preference_feedback (struct GNUNET_SERVER_Client *application,
  * @param message the request message
  */
 void
-GAS_handle_preference_feedback (void *cls,
+GAS_handle_feedback (void *cls,
                                 struct GNUNET_SERVER_Client *client,
                                 const struct GNUNET_MessageHeader *message)
 {
diff --git a/src/ats/gnunet-service-ats_feedback.h b/src/ats/gnunet-service-ats_feedback.h
index 4d34f616c..6cd133885 100644
--- a/src/ats/gnunet-service-ats_feedback.h
+++ b/src/ats/gnunet-service-ats_feedback.h
@@ -36,7 +36,7 @@
  * @param message the request message
  */
 void
-GAS_handle_preference_feedback (void *cls,
+GAS_handle_feedback (void *cls,
                                 struct GNUNET_SERVER_Client *client,
                                 const struct GNUNET_MessageHeader *message);
 
diff --git a/src/ats/gnunet-service-ats_normalization.c b/src/ats/gnunet-service-ats_normalization.c
index b3d8eba3f..936f8ca34 100644
--- a/src/ats/gnunet-service-ats_normalization.c
+++ b/src/ats/gnunet-service-ats_normalization.c
@@ -23,8 +23,6 @@
  * @brief ats service address: management of ATS properties and preferences normalization
  * @author Matthias Wachs
  * @author Christian Grothoff
- *
- * FIXME: rename to 'properties'!? merge with addresses!?
  */
 #include "platform.h"
 #include <float.h>
@@ -221,7 +219,7 @@ notify_change (void *cls,
   struct Property *p = cls;
   struct ATS_Address *address = value;
 
-  GAS_normalized_property_changed (address,
+  GAS_plugin_notify_property_changed (address,
                                    p->atsi_type,
                                    address->atsin[p->prop_type].norm);
   return GNUNET_OK;
@@ -236,7 +234,7 @@ notify_change (void *cls,
  * @param atsi_count the number of atsi information in the array
  */
 void
-GAS_normalization_normalize_property (struct ATS_Address *address,
+GAS_normalization_update_property (struct ATS_Address *address,
                                       const struct GNUNET_ATS_Information *atsi,
                                       uint32_t atsi_count)
 {
diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h
index add02ba42..614824d09 100644
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -42,7 +42,7 @@
  * @param atsi_count the number of atsi information in the array
  */
 void
-GAS_normalization_normalize_property (struct ATS_Address *address,
+GAS_normalization_update_property (struct ATS_Address *address,
                                       const struct GNUNET_ATS_Information *atsi,
                                       uint32_t atsi_count);
 
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c
index 8448e4c4e..b44934999 100644
--- a/src/ats/gnunet-service-ats_plugins.c
+++ b/src/ats/gnunet-service-ats_plugins.c
@@ -58,9 +58,9 @@ static char *plugin;
  * @param pref_rel the new relative preference value
  */
 void
-GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer,
-                                   enum GNUNET_ATS_PreferenceKind kind,
-                                   double pref_rel)
+GAS_plugin_notify_preference_changed (const struct GNUNET_PeerIdentity *peer,
+                                      enum GNUNET_ATS_PreferenceKind kind,
+                                      double pref_rel)
 {
   sf->s_pref (sf->cls,
               peer,
@@ -77,15 +77,10 @@ GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer,
  * @param prop_rel the new relative preference value
  */
 void
-GAS_normalized_property_changed (struct ATS_Address *address,
-                                 enum GNUNET_ATS_Property type,
-                                 double prop_rel)
+GAS_plugin_notify_property_changed (struct ATS_Address *address,
+                                    enum GNUNET_ATS_Property type,
+                                    double prop_rel)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Normalized property %s for peer `%s' changed to %.3f \n",
-              GNUNET_ATS_print_property_type (type),
-              GNUNET_i2s (&address->peer),
-              prop_rel);
   sf->s_address_update_property (sf->cls,
                                  address,
                                  type,
@@ -413,7 +408,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg,
  *         solver plugin)
  */
 int
-GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
+GAS_plugin_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   char *mode_str;
 
@@ -431,7 +426,7 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
   env.cls = NULL;
   env.info_cb = &solver_info_cb;
   env.bandwidth_changed_cb = &bandwidth_changed_cb;
-  env.get_preferences = &GAS_normalization_get_preferences_by_peer;
+  env.get_preferences = &GAS_preference_get_by_peer;
   env.cfg = cfg;
   env.stats = GSA_stats;
   env.addresses = GSA_addresses;
@@ -462,7 +457,7 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
  * Shutdown address subsystem.
  */
 void
-GAS_plugins_done ()
+GAS_plugin_done ()
 {
   GNUNET_PLUGIN_unload (plugin,
                         sf);
@@ -491,7 +486,7 @@ GAS_plugin_new_address (struct ATS_Address *new_address,
              new_address,
              addr_net);
   sf->s_bulk_start (sf->cls);
-  GAS_normalization_normalize_property (new_address,
+  GAS_normalization_update_property (new_address,
                                         atsi,
                                         atsi_count);
   sf->s_bulk_stop (sf->cls);
@@ -524,11 +519,11 @@ GAS_plugin_delete_address (struct ATS_Address *address)
  * @param score_abs degree of the appreciation
  */
 void
-GAS_plugin_preference_feedback (struct GNUNET_SERVER_Client *application,
-                                const struct GNUNET_PeerIdentity *peer,
-                                const struct GNUNET_TIME_Relative scope,
-                                enum GNUNET_ATS_PreferenceKind kind,
-                                float score_abs)
+GAS_plugin_notify_feedback (struct GNUNET_SERVER_Client *application,
+                            const struct GNUNET_PeerIdentity *peer,
+                            const struct GNUNET_TIME_Relative scope,
+                            enum GNUNET_ATS_PreferenceKind kind,
+                            float score_abs)
 {
   sf->s_feedback (sf->cls,
                   application,
diff --git a/src/ats/gnunet-service-ats_plugins.h b/src/ats/gnunet-service-ats_plugins.h
index 09c4b36f6..b2567ac26 100644
--- a/src/ats/gnunet-service-ats_plugins.h
+++ b/src/ats/gnunet-service-ats_plugins.h
@@ -41,14 +41,14 @@
  *         solver plugin)
  */
 int
-GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GAS_plugin_init (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
  * Shutdown address subsystem.
  */
 void
-GAS_plugins_done (void);
+GAS_plugin_done (void);
 
 
 /**
@@ -59,9 +59,9 @@ GAS_plugins_done (void);
  * @param pref_rel the new relative preference value
  */
 void
-GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer,
-                                   enum GNUNET_ATS_PreferenceKind kind,
-                                   double pref_rel);
+GAS_plugin_notify_preference_changed (const struct GNUNET_PeerIdentity *peer,
+                                      enum GNUNET_ATS_PreferenceKind kind,
+                                      double pref_rel);
 
 
 /**
@@ -69,12 +69,12 @@ GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer,
  *
  * @param address the peer
  * @param type the ATS type
- * @param prop_rel the new relative preference value
+ * @param prop_rel the new relative property value
  */
 void
-GAS_normalized_property_changed (struct ATS_Address *address,
-                                 enum GNUNET_ATS_Property type,
-                                 double prop_rel);
+GAS_plugin_notify_property_changed (struct ATS_Address *address,
+                                    enum GNUNET_ATS_Property type,
+                                    double prop_rel);
 
 
 /**
@@ -114,13 +114,11 @@ GAS_plugin_delete_address (struct ATS_Address *address);
  * @param score_abs degree of the appreciation
  */
 void
-GAS_plugin_preference_feedback (struct GNUNET_SERVER_Client *application,
-                                const struct GNUNET_PeerIdentity *peer,
-                                const struct GNUNET_TIME_Relative scope,
-                                enum GNUNET_ATS_PreferenceKind kind,
-                                float score_abs);
-
-
+GAS_plugin_notify_feedback (struct GNUNET_SERVER_Client *application,
+                            const struct GNUNET_PeerIdentity *peer,
+                            const struct GNUNET_TIME_Relative scope,
+                            enum GNUNET_ATS_PreferenceKind kind,
+                            float score_abs);
 
 
 /**
diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c
index a4d0ae1f4..c26a71b5d 100644
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -238,7 +238,7 @@ update_relative_values_for_peer (const struct GNUNET_PeerIdentity *id,
       rp->f_rel[kind] = DEFAULT_REL_PREFERENCE;
     }
     if (backup != rp->f_rel[kind])
-      GAS_normalized_preference_changed (&rp->id, kind,
+      GAS_plugin_notify_preference_changed (&rp->id, kind,
                                          rp->f_rel[kind]);
   }
 }
@@ -714,8 +714,8 @@ GAS_preference_done ()
  * default preferences if peer does not exist
  */
 const double *
-GAS_normalization_get_preferences_by_peer (void *cls,
-                                           const struct GNUNET_PeerIdentity *id)
+GAS_preference_get_by_peer (void *cls,
+                            const struct GNUNET_PeerIdentity *id)
 {
   struct PeerRelative *rp;
 
@@ -735,7 +735,7 @@ GAS_normalization_get_preferences_by_peer (void *cls,
  * @param client the client
  */
 void
-GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client *client)
+GAS_preference_client_disconnect (struct GNUNET_SERVER_Client *client)
 {
   struct PreferenceClient *c_cur;
 
diff --git a/src/ats/gnunet-service-ats_preferences.h b/src/ats/gnunet-service-ats_preferences.h
index 67a1368a5..5425b73ff 100644
--- a/src/ats/gnunet-service-ats_preferences.h
+++ b/src/ats/gnunet-service-ats_preferences.h
@@ -74,7 +74,7 @@ GAS_preference_done (void);
  *  with GNUNET_ATS_PreferenceKind, NULL if peer does not exist
  */
 const double *
-GAS_normalization_get_preferences_by_peer (void *cls,
+GAS_preference_get_by_peer (void *cls,
                                            const struct GNUNET_PeerIdentity *id);
 
 
@@ -84,7 +84,7 @@ GAS_normalization_get_preferences_by_peer (void *cls,
  * @param client the disconnecting client
  */
 void
-GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client *client);
+GAS_preference_client_disconnect (struct GNUNET_SERVER_Client *client);
 
 
 #endif
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index ef4c3ec5a..b7ddec503 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -418,7 +418,7 @@ bandwidth_changed_cb (void *cls,
 static const double *
 get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
 {
-  return GAS_normalization_get_preferences_by_peer (NULL, id);
+  return GAS_preference_get_by_peer (NULL, id);
 }
 
 
diff --git a/src/ats/plugin_ats_mlp.c b/src/ats/plugin_ats_mlp.c
index 152b52d15..ec53e7438 100644
--- a/src/ats/plugin_ats_mlp.c
+++ b/src/ats/plugin_ats_mlp.c
@@ -1477,8 +1477,10 @@ notify (struct GAS_MLP_Handle *mlp,
         enum GAS_Solver_Status stat,
         enum GAS_Solver_Additional_Information add)
 {
-  if (NULL != mlp->env->info_cb)
-    mlp->env->info_cb (mlp->env->cls, op, stat, add);
+  mlp->env->info_cb (mlp->env->cls,
+                     op,
+                     stat,
+                     add);
 }
 
 
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index ad85f805e..b4cabb067 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -1097,53 +1097,61 @@ distribute_bandwidth_in_network (struct GAS_PROPORTIONAL_Handle *s,
         GNUNET_ATS_print_network_type(n->type),
         n->active_addresses, n->total_addresses);
 
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_START,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_SINGLE);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_START,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_SINGLE);
 
     /* Distribute  */
     distribute_bandwidth(s, n);
 
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_STOP,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_SINGLE);
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_UPDATE_NOTIFICATION_START,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_SINGLE);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_STOP,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_SINGLE);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_UPDATE_NOTIFICATION_START,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_SINGLE);
 
     /* Do propagation */
     propagate_bandwidth (s, n);
 
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_SINGLE);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_SINGLE);
   }
   else
   {
     int i;
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_START,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_ALL);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_START,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_ALL);
     for (i = 0; i < s->network_count; i++)
     {
       /* Distribute */
       distribute_bandwidth(s, &s->network_entries[i]);
     }
 
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_STOP,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_ALL);
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_UPDATE_NOTIFICATION_START,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_ALL);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_STOP,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_ALL);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_UPDATE_NOTIFICATION_START,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_ALL);
     for (i = 0; i < s->network_count; i++)
     {
       /* Do propagation */
       propagate_bandwidth(s, &s->network_entries[i]);
     }
-    if (NULL != s->env->info_cb)
-      s->env->info_cb(s->env->cls, GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP,
-          GAS_STAT_SUCCESS, GAS_INFO_PROP_ALL);
+    s->env->info_cb (s->env->cls,
+                     GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP,
+                     GAS_STAT_SUCCESS,
+                     GAS_INFO_PROP_ALL);
   }
 }
 
diff --git a/src/ats/plugin_ats_ril.c b/src/ats/plugin_ats_ril.c
index bd3c5e4a5..76212e835 100644
--- a/src/ats/plugin_ats_ril.c
+++ b/src/ats/plugin_ats_ril.c
@@ -783,8 +783,10 @@ ril_inform (struct GAS_RIL_Handle *solver,
             enum GAS_Solver_Operation op,
             enum GAS_Solver_Status stat)
 {
-  if (NULL != solver->env->info_cb)
-    solver->env->info_cb (solver->env->cls, op, stat, GAS_INFO_NONE);
+  solver->env->info_cb (solver->env->cls,
+                        op,
+                        stat,
+                        GAS_INFO_NONE);
 }
 
 /**