aboutsummaryrefslogtreecommitdiff
path: root/src/mesh/gnunet-service-mesh.c
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2012-09-04 11:42:23 +0000
committerBart Polot <bart@net.in.tum.de>2012-09-04 11:42:23 +0000
commit148498775bb468c6dc586b95c7cfd007ce0c4b54 (patch)
treef0337026b68069bcd5ddade5340bd9485fcf6d20 /src/mesh/gnunet-service-mesh.c
parent44face75626b798d5b406e6cf3a3b5f1a8faa9e6 (diff)
downloadgnunet-148498775bb468c6dc586b95c7cfd007ce0c4b54.tar.gz
gnunet-148498775bb468c6dc586b95c7cfd007ce0c4b54.zip
- make sure all int64_t are treated as such
Diffstat (limited to 'src/mesh/gnunet-service-mesh.c')
-rw-r--r--src/mesh/gnunet-service-mesh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c
index 74a371352..e9b931e17 100644
--- a/src/mesh/gnunet-service-mesh.c
+++ b/src/mesh/gnunet-service-mesh.c
@@ -3565,7 +3565,7 @@ tunnel_get_children_fwd_ack (struct MeshTunnel *t)
3565 { 3565 {
3566 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3566 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3567 " tunnel has no children, no FWD ACK\n"); 3567 " tunnel has no children, no FWD ACK\n");
3568 return -1L; 3568 return -1LL;
3569 } 3569 }
3570 3570
3571 if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ctx.max_child_ack, t->fwd_pid)) 3571 if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ctx.max_child_ack, t->fwd_pid))
@@ -3619,7 +3619,7 @@ tunnel_get_clients_fwd_ack (struct MeshTunnel *t)
3619 { 3619 {
3620 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 3620 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
3621 " tunnel has no clients, no FWD ACK\n"); 3621 " tunnel has no clients, no FWD ACK\n");
3622 return -1L; 3622 return -1LL;
3623 } 3623 }
3624 3624
3625 for (ack = -1, i = 0; i < t->nclients; i++) 3625 for (ack = -1, i = 0; i < t->nclients; i++)
@@ -3663,13 +3663,13 @@ tunnel_get_fwd_ack (struct MeshTunnel *t)
3663 ack = count + buffer_free; // Might overflow 32 bits, it's ok! 3663 ack = count + buffer_free; // Might overflow 32 bits, it's ok!
3664 child_ack = tunnel_get_children_fwd_ack (t); 3664 child_ack = tunnel_get_children_fwd_ack (t);
3665 client_ack = tunnel_get_clients_fwd_ack (t); 3665 client_ack = tunnel_get_clients_fwd_ack (t);
3666 if (-1 == child_ack) 3666 if (-1LL == child_ack)
3667 { 3667 {
3668 // Node has no children, child_ack AND core buffer are irrelevant. 3668 // Node has no children, child_ack AND core buffer are irrelevant.
3669 GNUNET_break (-1 != client_ack); // No children AND no clients? Not good! 3669 GNUNET_break (-1 != client_ack); // No children AND no clients? Not good!
3670 return (uint32_t) client_ack; 3670 return (uint32_t) client_ack;
3671 } 3671 }
3672 if (-1 == client_ack) 3672 if (-1LL == client_ack)
3673 { 3673 {
3674 client_ack = ack; 3674 client_ack = ack;
3675 } 3675 }