Should be compilable without libglpk again

[oweals/gnunet.git] / src / ats / gnunet-service-ats_addresses_mlp.h

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h
index 766cad9438bb60931b54bc84bb90e8804753e242..f0af97dd6b17ec47572b9a78f6dd8a4a3876b4cb 100644 (file)
--- a/src/ats/gnunet-service-ats_addresses_mlp.h
+++ b/src/ats/gnunet-service-ats_addresses_mlp.h
@@ -64,13 +64,6 @@ struct ATS_Peer
   struct ATS_Address *tail;
 };
 
-struct ATS_PreferedAddress
-{
-  uint32_t bandwidth_out;
-  uint32_t bandwidth_in;
-  struct ATS_Address *address;
-};
-
 struct GAS_MLP_SolutionContext
 {
   int lp_result;
@@ -103,12 +96,20 @@ struct GAS_MLP_Handle
   /**
    * GLPK LP control parameter
    */
+#if HAVE_LIBGLPK
   glp_smcp control_param_lp;
+#else
+  void *control_param_lp;
+#endif
 
   /**
    * GLPK LP control parameter
    */
+#if HAVE_LIBGLPK
   glp_iocp control_param_mlp;
+#else
+  void *control_param_mlp;
+#endif
 
   /**
    * Solves the task in an regular interval
@@ -319,7 +320,9 @@ struct MLP_information
  */
 void *
 GAS_mlp_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
-              const struct GNUNET_STATISTICS_Handle *stats);
+              const struct GNUNET_STATISTICS_Handle *stats,
+              int *network,
+              unsigned long long *out_dest, unsigned long long *in_dest, int dest_length);
 
 
 /**
@@ -381,7 +384,7 @@ GAS_mlp_address_change_preference (void *solver,
  * @param peer the peer
  * @return suggested address
  */
-struct ATS_PreferedAddress *
+const struct ATS_Address *
 GAS_mlp_get_preferred_address (void *solver,
                                struct GNUNET_CONTAINER_MultiHashMap * addresses,
                                const struct GNUNET_PeerIdentity *peer);