[GNUnet-SVN] r35166 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2015-02-08 17:39:33 +0100 (Sun, 08 Feb 2015)
New Revision: 35166

Modified:
   gnunet/src/ats/plugin_ats_proportional.c
Log:
cleaning up get_active_address

Modified: gnunet/src/ats/plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/plugin_ats_proportional.c    2015-02-08 16:36:30 UTC (rev 
35165)
+++ gnunet/src/ats/plugin_ats_proportional.c    2015-02-08 16:39:33 UTC (rev 
35166)
@@ -843,20 +843,18 @@
 /**
  * Find current active address for peer
  *
- * @param solver the solver handle
- * @param addresses the address set
+ * @param s the solver handle
  * @param peer the peer
  * @return active address or NULL
  */
 static struct ATS_Address *
-get_active_address (void *solver,
-                    const struct GNUNET_CONTAINER_MultiPeerMap * addresses,
+get_active_address (struct GAS_PROPORTIONAL_Handle *s,
                     const struct GNUNET_PeerIdentity *peer)
 {
-  static struct ATS_Address *dest;
+  struct ATS_Address *dest;
 
   dest = NULL;
-  GNUNET_CONTAINER_multipeermap_get_multiple (addresses,
+  GNUNET_CONTAINER_multipeermap_get_multiple (s->env->addresses,
                                               peer,
                                               &get_active_address_it,
                                               &dest);
@@ -1092,7 +1090,6 @@
 
   /* Find active address */
   current_address = get_active_address (s,
-                                        s->env->addresses,
                                         peer);
 
   LOG (GNUNET_ERROR_TYPE_INFO,
@@ -1220,7 +1217,6 @@
 
   /* This peer is requested, find best address */
   active_address = get_active_address (s,
-                                       s->env->addresses,
                                        peer);
   best_address = update_active_address (s, peer);
 
@@ -1298,7 +1294,6 @@
   struct Network *cur_net;
 
   cur = get_active_address (s,
-                            s->env->addresses,
                             peer);
   if (NULL != cur)
   {
@@ -1383,27 +1378,13 @@
                                            double rel_value)
 {
   struct GAS_PROPORTIONAL_Handle *s = solver;
-  struct Network *n;
   struct AddressWrapper *asi;
   struct ATS_Address *best_address;
   struct ATS_Address *active_address;
 
   asi = address->solver_information;
-  if (NULL == asi)
-  {
-    GNUNET_break(0);
-    return;
-  }
-
-  n = asi->network;
-  if (NULL == n)
-  {
-    GNUNET_break(0);
-    return;
-  }
-
   LOG (GNUNET_ERROR_TYPE_INFO,
-       "Property `%s' for peer `%s' address %p changed to %.2f \n",
+       "Property `%s' for peer `%s' address %p changed to %.2f\n",
        GNUNET_ATS_print_property_type (type),
        GNUNET_i2s (&address->peer),
        address,
@@ -1416,7 +1397,6 @@
 
   /* This peer is requested, find active and best address */
   active_address = get_active_address(s,
-                                      s->env->addresses,
                                       &address->peer);
   best_address = update_active_address (s,
                                         &address->peer);
@@ -1520,7 +1500,6 @@
        net->total_addresses,
        net->active_addresses);
 
-  /* Remove address */
   GNUNET_CONTAINER_DLL_remove (net->head,
                                net->tail,
                                aw);