[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24097 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r24097 - gnunet/src/mesh |
Date: |
Fri, 28 Sep 2012 14:31:30 +0200 |
Author: bartpolot
Date: 2012-09-28 14:31:30 +0200 (Fri, 28 Sep 2012)
New Revision: 24097
Modified:
gnunet/src/mesh/gnunet-service-mesh.c
Log:
- fixes
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2012-09-28 12:16:14 UTC (rev
24096)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2012-09-28 12:31:30 UTC (rev
24097)
@@ -3701,7 +3701,7 @@
count = t->fwd_pid - t->skip;
buffer_free = t->fwd_queue_max - t->fwd_queue_n;
- ack = count;
+ ack = count + buffer_free;
child_ack = tunnel_get_children_fwd_ack (t);
client_ack = tunnel_get_clients_fwd_ack (t);
if (-1LL == child_ack)
@@ -3712,16 +3712,16 @@
}
if (-1LL == client_ack)
{
- client_ack = ack + buffer_free; // Might overflow 32 bits, it's ok!
+ client_ack = ack; // Might overflow 32 bits, it's ok!
}
if (GNUNET_YES == t->speed_min)
{
- ack = GMC_min_pid ((uint32_t) child_ack, ack) + buffer_free; // Might
overflow 32 bits, it's ok!;
+ ack = GMC_min_pid ((uint32_t) child_ack, ack); // Might overflow 32 bits,
it's ok!;
ack = GMC_min_pid ((uint32_t) client_ack, ack);
}
else
{
- ack = GMC_max_pid ((uint32_t) child_ack, ack) + buffer_free; // Might
overflow 32 bits, it's ok!;
+ ack = GMC_max_pid ((uint32_t) child_ack, ack); // Might overflow 32 bits,
it's ok!;
ack = GMC_max_pid ((uint32_t) client_ack, ack);
}
if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ack, t->fwd_pid))
@@ -8139,12 +8139,12 @@
main (int argc, char *const *argv)
{
int ret;
+ int r;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main()\n");
- ret =
- (GNUNET_OK ==
- GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE,
&run,
- NULL)) ? 0 : 1;
+ r = GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE, &run,
+ NULL);
+ ret = (GNUNET_OK == r) ? 0 : 1;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main() END\n");
INTERVAL_SHOW;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24097 - gnunet/src/mesh,
gnunet <=