From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 25 Jan 2012 10:29:29 +0000 (+0000)
Subject: -fix
X-Git-Tag: initial-import-from-subversion-38251~15122
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3fdda0a7448b87ebb5b4704682bd54c2b04c189d;p=oweals%2Fgnunet.git

-fix
---

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 2b391b1c4..3af9bb7c7 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -387,9 +387,7 @@ setup_estimate_message (struct GNUNET_NSE_ClientMessage *em)
   em->timestamp = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ());
   double se = mean - 0.332747;
   nsize = log2 (GNUNET_CONTAINER_multihashmap_size (peers) + 1);
-  if (em->size_estimate < nsize)
-    se = nsize;
-  em->size_estimate = GNUNET_hton_double (se);
+  em->size_estimate = GNUNET_hton_double (GNUNET_MAX (se, nsize));
   em->std_deviation = GNUNET_hton_double (std_dev);
   GNUNET_STATISTICS_set (stats, "# nodes in the network (estimate)",
                          (uint64_t) pow (2, mean - 1.0 / 3.0), GNUNET_NO);