[GNUnet-SVN] r20384 - gnunet/src/nse

[gnunet]

Author: bartpolot
Date: 2012-03-08 20:21:47 +0100 (Thu, 08 Mar 2012)
New Revision: 20384

Modified:
   gnunet/src/nse/gnunet-service-nse.c
Log:
- The next_message in the previous round should have the now current_timestamp.
- Check if it's better than our estimate before using.


Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2012-03-08 18:27:16 UTC (rev 20383)
+++ gnunet/src/nse/gnunet-service-nse.c 2012-03-08 19:21:47 UTC (rev 20384)
@@ -768,8 +768,10 @@
   estimate_index = (estimate_index + 1) % HISTORY_SIZE;
   if (estimate_count < HISTORY_SIZE)
     estimate_count++;
-  if (next_timestamp.abs_value ==
-      GNUNET_TIME_absolute_ntoh (next_message.timestamp).abs_value)
+  if ((current_timestamp.abs_value ==
+      GNUNET_TIME_absolute_ntoh (next_message.timestamp).abs_value) &&
+      (get_matching_bits (current_timestamp, &my_identity) >
+      ntohl(next_message.matching_bits)))
   {
     /* we received a message for this round way early, use it! */
     size_estimate_messages[estimate_index] = next_message;
@@ -1054,7 +1056,6 @@
 #endif
 
   ts = GNUNET_TIME_absolute_ntoh (incoming_flood->timestamp);
-
   if (ts.abs_value == current_timestamp.abs_value)
     idx = estimate_index;
   else if (ts.abs_value ==
@@ -1319,9 +1320,7 @@
 
   if (server == NULL)
   {
-#if DEBUG_NSE
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connection to core FAILED!\n");
-#endif
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connection to core FAILED!\n");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }