aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2013-07-13 12:09:33 +0000
committerBart Polot <bart@net.in.tum.de>2013-07-13 12:09:33 +0000
commit18aca86b3a7d63c06e9a4d0051734b8bbff018af (patch)
tree9bb23479b44457738e9569a79127266b3d374dce /src
parent0e44af8a33393dec3ec7ca13b38bacfa953d5d93 (diff)
downloadgnunet-18aca86b3a7d63c06e9a4d0051734b8bbff018af.tar.gz
gnunet-18aca86b3a7d63c06e9a4d0051734b8bbff018af.zip
fixes. lunch break
Diffstat (limited to 'src')
-rw-r--r--src/mesh/gnunet-service-mesh.c10
1 files changed, 9 insertions, 1 deletions
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)
2086 delta = copy->mid - t->bck_rel->mid_recv; 2086 delta = copy->mid - t->bck_rel->mid_recv;
2087 mask = 0x1 << delta; 2087 mask = 0x1 << delta;
2088 msg.futures |= mask; 2088 msg.futures |= mask;
2089 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2090 " setting bit for %u (delta %u) (%llX) -> %llX\n",
2091 copy->mid, delta, mask, msg.futures);
2089 } 2092 }
2090 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " final futures %llX\n", msg.futures); 2093 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " final futures %llX\n", msg.futures);
2091 2094
@@ -2384,6 +2387,8 @@ tunnel_add_buffer_ucast (struct MeshTunnel *t,
2384 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add_buffer_ucast %llu\n", mid); 2387 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "add_buffer_ucast %llu\n", mid);
2385 2388
2386 copy = GNUNET_malloc (sizeof (*copy) + size); 2389 copy = GNUNET_malloc (sizeof (*copy) + size);
2390 copy->mid = mid;
2391 copy->rel = rel;
2387 memcpy (&copy[1], msg, size); 2392 memcpy (&copy[1], msg, size);
2388 2393
2389 // FIXME do something better than O(n), although n < 64... 2394 // FIXME do something better than O(n), although n < 64...
@@ -2428,13 +2433,16 @@ tunnel_free_buffer_ucast (struct MeshTunnel *t,
2428 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 2433 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2429 "free_sent_buffer %llu %llX\n", 2434 "free_sent_buffer %llu %llX\n",
2430 mid, bitfield); 2435 mid, bitfield);
2436 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2437 " rel %p, copy %p\n",
2438 mid, bitfield);
2431 rel = t->fwd_rel; 2439 rel = t->fwd_rel;
2432 for (i = 0, copy = rel->head_recv; 2440 for (i = 0, copy = rel->head_recv;
2433 i < 64 && NULL != copy && 0 != bitfield; 2441 i < 64 && NULL != copy && 0 != bitfield;
2434 i++, copy = next) 2442 i++, copy = next)
2435 { 2443 {
2436 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " trying %u\n", i); 2444 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, " trying %u\n", i);
2437 mask = 0x1 << i; 2445 mask = 0x1LL << i;
2438 if (0 == (bitfield & mask)) 2446 if (0 == (bitfield & mask))
2439 continue; 2447 continue;
2440 2448