From: Matthias Wachs <wachs@net.in.tum.de>
Date: Fri, 8 Mar 2013 15:10:33 +0000 (+0000)
Subject: address specific names
X-Git-Tag: initial-import-from-subversion-38251~9709
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6419502e4bb83f53caf9f3fd5170f8219516e38a;p=oweals%2Fgnunet.git

address specific names
---

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index f8ac71bca..cf4570163 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -525,7 +525,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC
   	mlpi->r_q[0] = 0;
 
   /* Add bandwidth column */
-  GNUNET_asprintf (&name, "b_%s_%s", GNUNET_i2s (&address->peer), address->plugin);
+  GNUNET_asprintf (&name, "b_%s_%s_%p", GNUNET_i2s (&address->peer), address->plugin, address);
 #if TEST_MAX_BW_ASSIGNMENT
   mlpi->c_b = mlp_create_problem_create_column (p, name, GLP_CV, GLP_LO, 0.0, 0.0, 1.0);
 #else
@@ -535,7 +535,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC
   GNUNET_free (name);
 
   /* Add usage column */
-  GNUNET_asprintf (&name, "n_%s_%s", GNUNET_i2s (&address->peer), address->plugin);
+  GNUNET_asprintf (&name, "n_%s_%s_%p", GNUNET_i2s (&address->peer), address->plugin, address);
   mlpi->c_n = mlp_create_problem_create_column (p, name, GLP_IV, GLP_DB, 0.0, 1.0, 0.0);
   GNUNET_free (name);
 
@@ -543,7 +543,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC
 	/* Add constraint c1) bandwidth capping
    * b_t  + (-M) * n_t <= 0
    * */
-  GNUNET_asprintf(&name, "c1_%s_%s", GNUNET_i2s(&address->peer), address->plugin);
+  GNUNET_asprintf(&name, "c1_%s_%s_%p", GNUNET_i2s(&address->peer), address->plugin, address);
   mlpi->r_c1 = mlp_create_problem_create_constraint (p, name, GLP_UP, 0.0, 0.0);
 	GNUNET_free (name);
 
@@ -555,7 +555,7 @@ mlp_create_problem_add_address_information (void *cls, const struct GNUNET_HashC
   /* Add constraint c 3) minimum bandwidth
    * b_t + (-n_t * b_min) >= 0
    * */
-  GNUNET_asprintf(&name, "c3_%s_%s", GNUNET_i2s(&address->peer), address->plugin);
+  GNUNET_asprintf(&name, "c3_%s_%s_%p", GNUNET_i2s(&address->peer), address->plugin, address);
 	mlpi->r_c3 = mlp_create_problem_create_constraint (p, name, GLP_LO, 0.0, 0.0);
 	GNUNET_free (name);