From 18aca86b3a7d63c06e9a4d0051734b8bbff018af Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Sat, 13 Jul 2013 12:09:33 +0000 Subject: [PATCH] fixes. lunch break --- src/mesh/gnunet-service-mesh.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 38e1a9dd7..963a199e5 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -2086,6 +2086,9 @@ tunnel_send_fwd_data_ack (struct MeshTunnel *t) delta = copy->mid - t->bck_rel->mid_recv; mask = 0x1 << delta; msg.futures |= mask; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " setting bit for %u (delta %u) (%llX) -> %llX\n", + copy->mid, delta, mask, msg.futures); } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " final futures %llX\n", msg.futures); @@ -2384,6 +2387,8 @@ tunnel_add_buffer_ucast (struct MeshTunnel *t, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add_buffer_ucast %llu\n", mid); copy = GNUNET_malloc (sizeof (*copy) + size); + copy->mid = mid; + copy->rel = rel; memcpy (©[1], msg, size); // FIXME do something better than O(n), although n < 64... @@ -2428,13 +2433,16 @@ tunnel_free_buffer_ucast (struct MeshTunnel *t, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "free_sent_buffer %llu %llX\n", mid, bitfield); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " rel %p, copy %p\n", + mid, bitfield); rel = t->fwd_rel; for (i = 0, copy = rel->head_recv; i < 64 && NULL != copy && 0 != bitfield; i++, copy = next) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " trying %u\n", i); - mask = 0x1 << i; + mask = 0x1LL << i; if (0 == (bitfield & mask)) continue; -- 2.25.1