diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-10-26 22:13:01 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-10-26 22:13:01 +0000 |
commit | 64d3e46cfb99a711e500fa1f114e7c44bdf10040 (patch) | |
tree | 83093d92761d5c1b8b2fded713adaa19af29274c /src/core | |
parent | ef6f05f63769263a5201636c4b7f71eaa455cdf3 (diff) | |
download | gnunet-64d3e46cfb99a711e500fa1f114e7c44bdf10040.tar.gz gnunet-64d3e46cfb99a711e500fa1f114e7c44bdf10040.zip |
-bugfixes, code cleanup
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_api.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index 4d1a5493f..d2f5119ac 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -440,9 +440,7 @@ reconnect_later (struct GNUNET_CORE_Handle *h) | |||
440 | while (NULL != (pr = h->ready_peer_head)) | 440 | while (NULL != (pr = h->ready_peer_head)) |
441 | GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); | 441 | GNUNET_CONTAINER_DLL_remove (h->ready_peer_head, h->ready_peer_tail, pr); |
442 | GNUNET_assert (h->control_pending_head == NULL); | 442 | GNUNET_assert (h->control_pending_head == NULL); |
443 | h->retry_backoff = | 443 | h->retry_backoff = GNUNET_TIME_STD_BACKOFF (h->retry_backoff); |
444 | GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_SECONDS, h->retry_backoff); | ||
445 | h->retry_backoff = GNUNET_TIME_relative_multiply (h->retry_backoff, 2); | ||
446 | } | 444 | } |
447 | 445 | ||
448 | 446 | ||
@@ -1174,7 +1172,6 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
1174 | h->hcnt = 0; | 1172 | h->hcnt = 0; |
1175 | h->currently_down = GNUNET_YES; | 1173 | h->currently_down = GNUNET_YES; |
1176 | h->peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); | 1174 | h->peers = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); |
1177 | h->retry_backoff = GNUNET_TIME_UNIT_MILLISECONDS; | ||
1178 | if (NULL != handlers) | 1175 | if (NULL != handlers) |
1179 | while (handlers[h->hcnt].callback != NULL) | 1176 | while (handlers[h->hcnt].callback != NULL) |
1180 | h->hcnt++; | 1177 | h->hcnt++; |