Should be compilable without libglpk again

[oweals/gnunet.git] / src / ats / gnunet-service-ats_addresses.c

diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 73a9749df9397396fd7b4fd7fbc99ffb4ccf4958..b42fadb9bef53084b111650df1b225a3069f2014 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -31,15 +31,10 @@
 #include "gnunet-service-ats_performance.h"
 #include "gnunet-service-ats_scheduling.h"
 #include "gnunet-service-ats_reservations.h"
-#if HAVE_LIBGLPK
 #include "gnunet-service-ats_addresses_mlp.h"
-#endif
 #include "gnunet-service-ats_addresses_simplistic.h"
 
 
-#define BIG_M_VALUE (UINT32_MAX) /10
-#define BIG_M_STRING "unlimited"
-
 /**
  * Available ressource assignment modes
  */
@@ -94,11 +89,6 @@ struct GAS_Addresses_Handle
    */
   unsigned long long wan_quota_out;
 
-  /**
-   * Number of active addresses
-   */
-  unsigned int active_addr_count;
-
   /**
    * Is ATS addresses running
    */
@@ -247,17 +237,7 @@ destroy_address (struct ATS_Address *addr)
                                                        &addr->peer.hashPubKey,
                                                        addr));
 
-#if HAVE_LIBGLPK
-  if (handle->ats_mode == MODE_MLP)
-    GAS_mlp_address_delete (handle->solver, handle->addresses, addr);
-#endif
-
-  if (GNUNET_YES == addr->active)
-  {
-    handle->active_addr_count--;
-    addr->active = GNUNET_NO;
-    ret = GNUNET_YES;
-  }
+  handle->s_del (handle->solver, handle->addresses, addr);
   free_address (addr);
   return ret;
 }
@@ -474,7 +454,6 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
                        plugin_name,
                        plugin_addr, plugin_addr_len,
                        session_id);
-
   aa->mlp_information = NULL;
   aa->ats = GNUNET_malloc (atsi_count * sizeof (struct GNUNET_ATS_Information));
   aa->ats_count = atsi_count;
@@ -491,31 +470,34 @@ GAS_addresses_add (const struct GNUNET_PeerIdentity *peer,
                                                       GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' session id %u, %p\n",
                 GNUNET_i2s (peer), session_id, aa);
+    /* Tell solver about update */
+    handle->s_update (handle->solver, handle->addresses, aa);
     return;
   }
 
-  if (old->session_id == 0)
+  if (old->session_id != 0)
   {
-    /* We have a base address with out an session, update this address */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Updated existing address for peer `%s' %p with new session %u\n",
-              GNUNET_i2s (peer), old, session_id);
-    GNUNET_free_non_null (old->ats);
-    old->session_id = session_id;
-    old->ats = NULL;
-    old->ats_count = 0;
-    old->ats = aa->ats;
-    old->ats_count = aa->ats_count;
-    GNUNET_free (aa->plugin);
-    GNUNET_free (aa);
-    return;
+      /* This address and session is already existing */
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Added already existing address for peer `%s' `%s' %p with new session %u\n",
+                GNUNET_i2s (peer), plugin_name, session_id);
+      GNUNET_break (0);
+      return;
   }
 
-  /* This address and session is already existing */
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-            "Added already existing address for peer `%s' `%s' %p with new session %u\n",
-            GNUNET_i2s (peer), plugin_name, session_id);
-  GNUNET_break (0);
+  /* We have an address without an session, update this address */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+            "Updated existing address for peer `%s' %p with new session %u\n",
+            GNUNET_i2s (peer), old, session_id);
+  GNUNET_free_non_null (old->ats);
+  old->session_id = session_id;
+  old->ats = NULL;
+  old->ats_count = 0;
+  old->ats = aa->ats;
+  old->ats_count = aa->ats_count;
+  GNUNET_free (aa->plugin);
+  GNUNET_free (aa);
+  handle->s_update (handle->solver, handle->addresses, old);
 }
 
 
@@ -579,7 +561,6 @@ GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
       GNUNET_break (0);
       break;
     }
-
   /* Tell solver about update */
   handle->s_update (handle->solver, handle->addresses, old);
 }
@@ -615,9 +596,9 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Deleting address for peer `%s': `%s' %u\n",
                 GNUNET_i2s (&aa->peer), aa->plugin, aa->session_id);
-    /*FIXME
-    if (GNUNET_YES == destroy_address (aa))
-      recalculate_assigned_bw (); */
+
+    destroy_address (aa);
+      // FIXME if (GNUNET_YES == destroy_address (aa))recalculate_assigned_bw ();
     return GNUNET_OK;
   }
   /* session != 0, just remove session */
@@ -634,7 +615,6 @@ destroy_by_session_id (void *cls, const struct GNUNET_HashCode * key, void *valu
   if (GNUNET_YES == aa->active)
   {
     aa->active = GNUNET_NO;
-    handle->active_addr_count--;
     //FIXME recalculate_assigned_bw ();
   }
 
@@ -680,13 +660,10 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer,
     return;
   }
 
-
   GNUNET_break (0 < strlen (plugin_name));
   aa = create_address (peer, plugin_name, plugin_addr, plugin_addr_len, session_id);
-
   GNUNET_CONTAINER_multihashmap_get_multiple (handle->addresses, &peer->hashPubKey,
                                               &destroy_by_session_id, aa);
-
   free_address (aa);
 }
 
@@ -755,7 +732,8 @@ GAS_addresses_request_address_cancel (const struct GNUNET_PeerIdentity *peer)
 
   if (NULL == cur)
   {
-      GNUNET_break (0);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "No address requests pending for peer `%s', cannot remove!\n", GNUNET_i2s (peer));
       return;
   }
   GNUNET_CONTAINER_DLL_remove (handle->r_head, handle->r_tail, cur);
@@ -1071,7 +1049,6 @@ GAS_addresses_destroy_all ()
 
   if (handle->addresses != NULL)
     GNUNET_CONTAINER_multihashmap_iterate (handle->addresses, &free_address_it, NULL);
-  GNUNET_assert (handle->active_addr_count == 0);
 }