diff options
author | Bart Polot <bart@net.in.tum.de> | 2012-09-28 12:31:30 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2012-09-28 12:31:30 +0000 |
commit | 15e0bcb27f2d9eede1f4ae2ce80bc87f2bca6c65 (patch) | |
tree | abc09db29ed4d6b6f409e2aa8bb34a8cc2049373 /src/mesh/gnunet-service-mesh.c | |
parent | afc3aa1b69a534bce5f9cbf16090bd79c4139d3d (diff) | |
download | gnunet-15e0bcb27f2d9eede1f4ae2ce80bc87f2bca6c65.tar.gz gnunet-15e0bcb27f2d9eede1f4ae2ce80bc87f2bca6c65.zip |
- fixes
Diffstat (limited to 'src/mesh/gnunet-service-mesh.c')
-rw-r--r-- | src/mesh/gnunet-service-mesh.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 3242520d2..99acb6b47 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c | |||
@@ -3701,7 +3701,7 @@ tunnel_get_fwd_ack (struct MeshTunnel *t) | |||
3701 | 3701 | ||
3702 | count = t->fwd_pid - t->skip; | 3702 | count = t->fwd_pid - t->skip; |
3703 | buffer_free = t->fwd_queue_max - t->fwd_queue_n; | 3703 | buffer_free = t->fwd_queue_max - t->fwd_queue_n; |
3704 | ack = count; | 3704 | ack = count + buffer_free; |
3705 | child_ack = tunnel_get_children_fwd_ack (t); | 3705 | child_ack = tunnel_get_children_fwd_ack (t); |
3706 | client_ack = tunnel_get_clients_fwd_ack (t); | 3706 | client_ack = tunnel_get_clients_fwd_ack (t); |
3707 | if (-1LL == child_ack) | 3707 | if (-1LL == child_ack) |
@@ -3712,16 +3712,16 @@ tunnel_get_fwd_ack (struct MeshTunnel *t) | |||
3712 | } | 3712 | } |
3713 | if (-1LL == client_ack) | 3713 | if (-1LL == client_ack) |
3714 | { | 3714 | { |
3715 | client_ack = ack + buffer_free; // Might overflow 32 bits, it's ok! | 3715 | client_ack = ack; // Might overflow 32 bits, it's ok! |
3716 | } | 3716 | } |
3717 | if (GNUNET_YES == t->speed_min) | 3717 | if (GNUNET_YES == t->speed_min) |
3718 | { | 3718 | { |
3719 | ack = GMC_min_pid ((uint32_t) child_ack, ack) + buffer_free; // Might overflow 32 bits, it's ok!; | 3719 | ack = GMC_min_pid ((uint32_t) child_ack, ack); // Might overflow 32 bits, it's ok!; |
3720 | ack = GMC_min_pid ((uint32_t) client_ack, ack); | 3720 | ack = GMC_min_pid ((uint32_t) client_ack, ack); |
3721 | } | 3721 | } |
3722 | else | 3722 | else |
3723 | { | 3723 | { |
3724 | ack = GMC_max_pid ((uint32_t) child_ack, ack) + buffer_free; // Might overflow 32 bits, it's ok!; | 3724 | ack = GMC_max_pid ((uint32_t) child_ack, ack); // Might overflow 32 bits, it's ok!; |
3725 | ack = GMC_max_pid ((uint32_t) client_ack, ack); | 3725 | ack = GMC_max_pid ((uint32_t) client_ack, ack); |
3726 | } | 3726 | } |
3727 | if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ack, t->fwd_pid)) | 3727 | if (GNUNET_YES == t->nobuffer && GMC_is_pid_bigger(ack, t->fwd_pid)) |
@@ -8139,12 +8139,12 @@ int | |||
8139 | main (int argc, char *const *argv) | 8139 | main (int argc, char *const *argv) |
8140 | { | 8140 | { |
8141 | int ret; | 8141 | int ret; |
8142 | int r; | ||
8142 | 8143 | ||
8143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main()\n"); | 8144 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main()\n"); |
8144 | ret = | 8145 | r = GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE, &run, |
8145 | (GNUNET_OK == | 8146 | NULL); |
8146 | GNUNET_SERVICE_run (argc, argv, "mesh", GNUNET_SERVICE_OPTION_NONE, &run, | 8147 | ret = (GNUNET_OK == r) ? 0 : 1; |
8147 | NULL)) ? 0 : 1; | ||
8148 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main() END\n"); | 8148 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "main() END\n"); |
8149 | 8149 | ||
8150 | INTERVAL_SHOW; | 8150 | INTERVAL_SHOW; |