[GNUnet-SVN] r27918 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-07-11 15:03:08 +0200 (Thu, 11 Jul 2013)
New Revision: 27918

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
   gnunet/src/mesh/test_mesh_small.c
Log:
- more mess from retransmission of data

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-11 12:56:53 UTC (rev 
27917)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-11 13:03:08 UTC (rev 
27918)
@@ -3724,7 +3724,8 @@
     tunnel_send_fwd_ack (t, GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK);
     return GNUNET_OK;
   }
-  t->prev_fc.last_pid_recv = pid;
+  if (GMC_is_pid_bigger(pid, t->prev_fc.last_pid_recv))
+    t->prev_fc.last_pid_recv = pid;
   if (0 == t->next_hop)
   {
     GNUNET_break (0);
@@ -3829,7 +3830,8 @@
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "  not for us, retransmitting...\n");
-  t->next_fc.last_pid_recv = pid;
+  if (GMC_is_pid_bigger (pid, t->next_fc.last_pid_recv))
+    t->next_fc.last_pid_recv = pid;
   if (0 == t->prev_hop) /* No owner AND no prev hop */
   {
     if (GNUNET_YES == t->destroy)

Modified: gnunet/src/mesh/test_mesh_small.c
===================================================================
--- gnunet/src/mesh/test_mesh_small.c   2013-07-11 12:56:53 UTC (rev 27917)
+++ gnunet/src/mesh/test_mesh_small.c   2013-07-11 13:03:08 UTC (rev 27918)
@@ -42,7 +42,7 @@
 /**
  * Time to wait for stuff that should be rather fast
  */
-#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 20)
+#define SHORT_TIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
 /**
  * DIFFERENT TESTS TO RUN