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

[gnunet]

Author: bartpolot
Date: 2012-05-14 13:26:59 +0200 (Mon, 14 May 2012)
New Revision: 21472

Modified:
   gnunet/src/nse/gnunet-service-nse.c
Log:
- Minor style changes, doc


Modified: gnunet/src/nse/gnunet-service-nse.c
===================================================================
--- gnunet/src/nse/gnunet-service-nse.c 2012-05-14 11:11:53 UTC (rev 21471)
+++ gnunet/src/nse/gnunet-service-nse.c 2012-05-14 11:26:59 UTC (rev 21472)
@@ -967,7 +967,7 @@
     /* still stuck in previous round, no point to update, check that
      * we are active here though... */
     if (GNUNET_SCHEDULER_NO_TASK == peer_entry->transmit_task &&
-                  NULL == peer_entry->th)
+        NULL == peer_entry->th)
     {
         GNUNET_break (0);
     }
@@ -1132,14 +1132,12 @@
   }
   GNUNET_assert (matching_bits >
                  ntohl (size_estimate_messages[idx].matching_bits));
-  /* cancel transmission from us to this peer for this round */
+  /* Cancel transmission in the other direction, as this peer clearly has
+   * up-to-date information already.
+   */
+  peer_entry->previous_round = GNUNET_YES;
   if (idx == estimate_index)
   {
-      /* Cancel transmission in the other direction, as this peer clearly has
-       up-to-date information already. Even if we didn't talk to this peer in
-       the previous round, we should no longer send it stale information as it
-       told us about the current round! */
-      peer_entry->previous_round = GNUNET_YES;
       /* cancel any activity for current round */
       if (peer_entry->transmit_task != GNUNET_SCHEDULER_NO_TASK)
       {
@@ -1152,11 +1150,6 @@
         peer_entry->th = NULL;
       }
   }
-  else
-  {
-    /* cancel previous round only */
-    peer_entry->previous_round = GNUNET_YES;
-  }
   size_estimate_messages[idx] = *incoming_flood;
   size_estimate_messages[idx].hop_count =
       htonl (ntohl (incoming_flood->hop_count) + 1);