From 8a03d1738d8db6293778be8becb6eaf2ed3a9a0a Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 11 Jul 2013 13:03:08 +0000 Subject: - more mess from retransmission of data --- src/mesh/gnunet-service-mesh.c | 6 ++++-- src/mesh/test_mesh_small.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 7b5c7fc1b..e61b978f0 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -3724,7 +3724,8 @@ handle_mesh_unicast (void *cls, const struct GNUNET_PeerIdentity *peer, 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 @@ handle_mesh_to_orig (void *cls, const struct GNUNET_PeerIdentity *peer, } 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) diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index 28d1dba60..a8d019d22 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c @@ -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 -- cgit v1.2.3