From: Nathan S. Evans <evans@in.tum.de>
Date: Wed, 27 Jul 2011 12:41:00 +0000 (+0000)
Subject: redo send on connect
X-Git-Tag: initial-import-from-subversion-38251~17603
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2692cd41f52623b3599bbf9c8b5aa8572f7b90e8;p=oweals%2Fgnunet.git

redo send on connect
---

diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c
index 333c83776..a926c1f23 100644
--- a/src/nse/gnunet-service-nse.c
+++ b/src/nse/gnunet-service-nse.c
@@ -45,6 +45,11 @@
 #include "gnunet_nse_service.h"
 #include "nse.h"
 
+/**
+ * Send messages on connect.
+ */
+#define SEND_ON_CONNECT GNUNET_YES
+
 /**
  * Should we generate a histogram with the time stamps of when we received
  * NSE messages to disk? (for performance evaluation only, not useful in
@@ -303,9 +308,10 @@ setup_estimate_message (struct GNUNET_NSE_ClientMessage *em)
   mean = 0.0;
   sum = 0.0;
   sumweight = 0.0;
-  for (i=0;i<estimate_count; i++)
+  for (i = 0; i < estimate_count; i++)
     {
-      val = htonl (size_estimate_messages[(estimate_index - i + HISTORY_SIZE) % HISTORY_SIZE].matching_bits);
+      val = htonl (size_estimate_messages[(estimate_index - i + HISTORY_SIZE)
+          % HISTORY_SIZE].matching_bits);
       weight = estimate_count + 1 - i;
 
       temp = weight + sumweight;
@@ -701,7 +707,7 @@ update_flood_message(void *cls,
     setup_flood_message (estimate_index, current_timestamp);
   next_message.matching_bits = htonl (0); /* reset for 'next' round */
   hop_count_max = 0;
-  for (i=0;i<HISTORY_SIZE;i++)
+  for (i = 0; i < HISTORY_SIZE; i++)
     hop_count_max = GNUNET_MAX (ntohl (size_estimate_messages[i].hop_count),
 				hop_count_max);
   GNUNET_CONTAINER_multihashmap_iterate (peers,
@@ -996,7 +1002,9 @@ handle_p2p_size_estimate(void *cls,
       GNUNET_break (0);
       return GNUNET_OK;
     }
+
   ts = GNUNET_TIME_absolute_ntoh (incoming_flood->timestamp);
+
   if (ts.abs_value == current_timestamp.abs_value)
     idx = estimate_index;
   else if (ts.abs_value == current_timestamp.abs_value - gnunet_nse_interval.rel_value)
@@ -1243,7 +1251,7 @@ core_init (void *cls, struct GNUNET_CORE_Handle *server,
   current_timestamp.abs_value = (now.abs_value / gnunet_nse_interval.rel_value) * gnunet_nse_interval.rel_value;
   next_timestamp.abs_value = current_timestamp.abs_value + gnunet_nse_interval.rel_value;
   
-  for (i=0;i<HISTORY_SIZE;i++)
+  for (i = 0; i < HISTORY_SIZE; i++)
     {
       prev_time.abs_value = current_timestamp.abs_value - (HISTORY_SIZE - i - 1) * gnunet_nse_interval.rel_value;
       setup_flood_message (i, prev_time);