[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30594 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30594 - gnunet/src/ats |
Date: |
Thu, 7 Nov 2013 11:16:57 +0100 |
Author: wachs
Date: 2013-11-07 11:16:57 +0100 (Thu, 07 Nov 2013)
New Revision: 30594
Modified:
gnunet/src/ats/libgnunet_plugin_ats_mlp.c
gnunet/src/ats/libgnunet_plugin_ats_proportional.c
gnunet/src/ats/perf_ats_solver.c
Log:
randomization was off by one
Modified: gnunet/src/ats/libgnunet_plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_mlp.c 2013-11-07 10:00:05 UTC (rev
30593)
+++ gnunet/src/ats/libgnunet_plugin_ats_mlp.c 2013-11-07 10:16:57 UTC (rev
30594)
@@ -1266,6 +1266,12 @@
GNUNET_assert (NULL != solver);
GNUNET_assert (NULL != address);
+ if (GNUNET_ATS_NetworkTypeCount >= network)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
if (NULL == address->solver_information)
{
address->solver_information = GNUNET_new (struct MLP_information);
@@ -1429,6 +1435,12 @@
GNUNET_assert (NULL != solver);
GNUNET_assert (NULL != address);
+ if (GNUNET_ATS_NetworkTypeCount >= new_network)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
if (NULL == mlpi)
{
GNUNET_break (0);
Modified: gnunet/src/ats/libgnunet_plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_proportional.c 2013-11-07 10:00:05 UTC
(rev 30593)
+++ gnunet/src/ats/libgnunet_plugin_ats_proportional.c 2013-11-07 10:16:57 UTC
(rev 30594)
@@ -1490,7 +1490,6 @@
struct AddressWrapper *aw = NULL;
GNUNET_assert(NULL != s);
-
net = get_network (s, network);
if (NULL == net)
{
Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c 2013-11-07 10:00:05 UTC (rev 30593)
+++ gnunet/src/ats/perf_ats_solver.c 2013-11-07 10:16:57 UTC (rev 30594)
@@ -844,7 +844,7 @@
{
cur_addr = perf_create_address (cp, ca);
/* Add address */
- ph.env.sf.s_add (ph.solver, cur_addr,
GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK,
GNUNET_ATS_NetworkTypeCount + 1));
+ ph.env.sf.s_add (ph.solver, cur_addr,
GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK,
GNUNET_ATS_NetworkTypeCount));
ph.current_a = ca + 1;
perf_address_initial_update (ph.solver, ph.addresses, cur_addr);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30594 - gnunet/src/ats,
gnunet <=