From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 19 Feb 2013 16:46:35 +0000 (+0000)
Subject: changes
X-Git-Tag: initial-import-from-subversion-38251~9880
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc1ad6f40db1b739f5218f9aedb6d4863693fe94;p=oweals%2Fgnunet.git

changes
---

diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c
index 31ce2b15d..8bf9f127a 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.c
+++ b/src/ats/gnunet-service-ats_addresses_mlp.c
@@ -1035,6 +1035,10 @@ GAS_mlp_solve_problem (void *solver, struct GAS_MLP_SolutionContext *ctx)
 {
   struct GAS_MLP_Handle *mlp = solver;
   int res;
+
+  GNUNET_assert (NULL != solver);
+  GNUNET_assert (NULL != ctx);
+
   /* Check if solving is already running */
   if (GNUNET_YES == mlp->semaphore)
   {
@@ -1097,7 +1101,9 @@ GAS_mlp_solve_problem (void *solver, struct GAS_MLP_SolutionContext *ctx)
 # endif
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Problem solved %s (LP duration %llu / MLP duration %llu)\n",
-      (GNUNET_OK == res) ? "successfully" : "failed", ctx->lp_duration.rel_value, ctx->mlp_duration.rel_value);
+      (GNUNET_OK == res) ? "successfully" : "failed",
+      ctx->lp_duration.rel_value,
+      ctx->mlp_duration.rel_value);
   /* Process result */
   struct ATS_Peer *p = NULL;
   struct ATS_Address *a = NULL;
@@ -1118,12 +1124,29 @@ GAS_mlp_solve_problem (void *solver, struct GAS_MLP_SolutionContext *ctx)
 
       n = glp_mip_col_val(mlp->prob, mlpi->c_n);
       if (n == 1.0)
+      {
+      	/* This is the address to be used */
         mlpi->n = GNUNET_YES;
+      }
       else
+      {
+      	/* This is the address not used */
         mlpi->n = GNUNET_NO;
+      }
 
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\tAddress %s %f\n",
           (n == 1.0) ? "[x]" : "[ ]", b);
+
+      /* Notify addresses */
+      if ((ntohl(a->assigned_bw_in.value__) != b) ||
+      		(ntohl(a->assigned_bw_out.value__) != b) ||
+      		(mlpi->n != a->active))
+      {
+      		a->assigned_bw_in.value__ = htonl(b);
+      		a->assigned_bw_out.value__ = htonl(b);
+      		a->active = mlpi->n;
+      		mlp->bw_changed_cb (mlp->bw_changed_cb_cls, a);
+      }
     }
   }
 
diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c
index 4075597fa..0239189c7 100644
--- a/src/ats/test_ats_mlp.c
+++ b/src/ats/test_ats_mlp.c
@@ -60,7 +60,7 @@ struct GNUNET_PeerIdentity p;
 /**
  * ATS Address
  */
-struct ATS_Address *address;
+struct ATS_Address *address[2];
 
 /**
  * Timeout task
@@ -86,7 +86,9 @@ int addr_it (void *cls,
              const struct GNUNET_HashCode * key,
              void *value)
 {
+	struct ATS_Address *address = (struct ATS_Address *) value;
 	GNUNET_CONTAINER_multihashmap_remove (addresses, key, value);
+  GNUNET_free (address);
 	return GNUNET_OK;
 }
 
@@ -114,11 +116,6 @@ end_now (int res)
   		GNUNET_CONTAINER_multihashmap_iterate (addresses, &addr_it, NULL);
   		GNUNET_CONTAINER_multihashmap_destroy (addresses);
   		addresses = NULL ;
-  }
-  if (NULL != address)
-  {
-  	GNUNET_free (address);
-  	address = NULL;
   }
 	ret = res;
 }
@@ -126,7 +123,8 @@ end_now (int res)
 static void
 bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "bandwidth_changed_cb\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "MLP tells suggests me for peer `%s' address `%s':`%s'\n",
+  		GNUNET_i2s(&address->peer), address->plugin, address->addr);
 	end_now (0);
 }
 
@@ -184,6 +182,7 @@ check (void *cls, char *const *args, const char *cfgfile,
       end_now (1);
       return;
   }
+  mlp->auto_solve = GNUNET_NO;
 
   /* Create peer */
   if (GNUNET_SYSERR == GNUNET_CRYPTO_hash_from_string(PEERID0, &p.hashPubKey))
@@ -193,34 +192,50 @@ check (void *cls, char *const *args, const char *cfgfile,
       return;
   }
 
-  /* Create address */
-  address = create_address (&p, "test_plugin", "test_addr", strlen("test_addr")+1, 0);
-  if (NULL == address)
+  /* Create address 0 */
+  address[0] = create_address (&p, "test_plugin", "test_addr0", strlen("test_addr0")+1, 0);
+  if (NULL == address[0])
   {
     	GNUNET_break (0);
       end_now (1);
       return;
   }
-  GNUNET_CONTAINER_multihashmap_put (addresses, &p.hashPubKey, address,
+  GNUNET_CONTAINER_multihashmap_put (addresses, &p.hashPubKey, address[0],
   		GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
 
-  /* Adding address */
-  GAS_mlp_address_add (mlp, addresses, address);
+  /* Adding address 0 */
+  GAS_mlp_address_add (mlp, addresses, address[0]);
 
-  /* Updating address */
+  /* Updating address 0*/
   ats.type =  htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats.value = htonl (GNUNET_ATS_NET_LAN);
-  GAS_mlp_address_update (mlp, addresses, address, 1, GNUNET_NO, &ats, 1);
+  ats.value = htonl (GNUNET_ATS_NET_WAN);
+  GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, &ats, 1);
+
+  /* Create address 1 */
+  address[1] = create_address (&p, "test_plugin", "test_addr1", strlen("test_addr1")+1, 0);
+  if (NULL == address[1])
+  {
+    	GNUNET_break (0);
+      end_now (1);
+      return;
+  }
+  GNUNET_CONTAINER_multihashmap_put (addresses, &p.hashPubKey, address[1],
+  		GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+
+  /* Adding address 1*/
+  GAS_mlp_address_add (mlp, addresses, address[1]);
+
+  /* Updating address 1*/
+  ats.type =  htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl (GNUNET_ATS_NET_WAN);
+  GAS_mlp_address_update (mlp, addresses, address[1], 1, GNUNET_NO, &ats, 1);
 
   /* Retrieving preferred address for peer and wait for callback */
   GAS_mlp_get_preferred_address (mlp, addresses, &p);
 
-  GAS_mlp_address_delete (mlp, addresses, address, GNUNET_NO);
-
-  /* Shutdown */
-  GAS_mlp_done (mlp);
-  mlp = NULL;
   end_now (0);
+  //struct GAS_MLP_SolutionContext ctx;
+  //GAS_mlp_solve_problem (mlp, &ctx);
 }