diff options
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
-rw-r--r-- | src/transport/gnunet-service-transport.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 9d3e9d7c5..c1bb7bec6 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -1496,7 +1496,7 @@ find_ready_address(struct NeighbourList *neighbour) | |||
1496 | addresses = head->addresses; | 1496 | addresses = head->addresses; |
1497 | while (addresses != NULL) | 1497 | while (addresses != NULL) |
1498 | { | 1498 | { |
1499 | if ( (addresses->timeout.value < now.value) && | 1499 | if ( (addresses->timeout.abs_value < now.abs_value) && |
1500 | (addresses->connected == GNUNET_YES) ) | 1500 | (addresses->connected == GNUNET_YES) ) |
1501 | { | 1501 | { |
1502 | #if DEBUG_TRANSPORT | 1502 | #if DEBUG_TRANSPORT |
@@ -1528,7 +1528,7 @@ find_ready_address(struct NeighbourList *neighbour) | |||
1528 | addresses->in_transmit, | 1528 | addresses->in_transmit, |
1529 | addresses->validated, | 1529 | addresses->validated, |
1530 | addresses->connect_attempts, | 1530 | addresses->connect_attempts, |
1531 | (unsigned long long) addresses->timeout.value, | 1531 | (unsigned long long) addresses->timeout.abs_value, |
1532 | (unsigned int) addresses->distance); | 1532 | (unsigned int) addresses->distance); |
1533 | #endif | 1533 | #endif |
1534 | if ( ( (best_address == NULL) || | 1534 | if ( ( (best_address == NULL) || |
@@ -1536,7 +1536,7 @@ find_ready_address(struct NeighbourList *neighbour) | |||
1536 | (best_address->connected == GNUNET_NO) ) && | 1536 | (best_address->connected == GNUNET_NO) ) && |
1537 | (addresses->in_transmit == GNUNET_NO) && | 1537 | (addresses->in_transmit == GNUNET_NO) && |
1538 | ( (best_address == NULL) || | 1538 | ( (best_address == NULL) || |
1539 | (addresses->latency.value < best_address->latency.value)) ) | 1539 | (addresses->latency.rel_value < best_address->latency.rel_value)) ) |
1540 | best_address = addresses; | 1540 | best_address = addresses; |
1541 | /* FIXME: also give lower-latency addresses that are not | 1541 | /* FIXME: also give lower-latency addresses that are not |
1542 | connected a chance some times... */ | 1542 | connected a chance some times... */ |
@@ -1554,7 +1554,7 @@ find_ready_address(struct NeighbourList *neighbour) | |||
1554 | best_address->addr, | 1554 | best_address->addr, |
1555 | best_address->addrlen) | 1555 | best_address->addrlen) |
1556 | : "<inbound>", | 1556 | : "<inbound>", |
1557 | best_address->latency.value); | 1557 | best_address->latency.abs_value); |
1558 | #endif | 1558 | #endif |
1559 | } | 1559 | } |
1560 | else | 1560 | else |
@@ -1627,7 +1627,7 @@ try_transmission_to_peer (struct NeighbourList *neighbour) | |||
1627 | 1, | 1627 | 1, |
1628 | GNUNET_NO); | 1628 | GNUNET_NO); |
1629 | timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout); | 1629 | timeout = GNUNET_TIME_absolute_get_remaining (mq->timeout); |
1630 | if (timeout.value == 0) | 1630 | if (timeout.rel_value == 0) |
1631 | { | 1631 | { |
1632 | #if DEBUG_TRANSPORT | 1632 | #if DEBUG_TRANSPORT |
1633 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1633 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -1667,7 +1667,7 @@ try_transmission_to_peer (struct NeighbourList *neighbour) | |||
1667 | "No validated destination address available to transmit message of size %u to peer `%4s', will wait %llums to find an address.\n", | 1667 | "No validated destination address available to transmit message of size %u to peer `%4s', will wait %llums to find an address.\n", |
1668 | mq->message_buf_size, | 1668 | mq->message_buf_size, |
1669 | GNUNET_i2s (&mq->neighbour_id), | 1669 | GNUNET_i2s (&mq->neighbour_id), |
1670 | timeout.value); | 1670 | timeout.abs_value); |
1671 | #endif | 1671 | #endif |
1672 | /* FIXME: might want to trigger peerinfo lookup here | 1672 | /* FIXME: might want to trigger peerinfo lookup here |
1673 | (unless that's already pending...) */ | 1673 | (unless that's already pending...) */ |
@@ -1928,13 +1928,13 @@ update_addresses (struct TransportPlugin *plugin, int fresh) | |||
1928 | plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK; | 1928 | plugin->address_update_task = GNUNET_SCHEDULER_NO_TASK; |
1929 | now = GNUNET_TIME_absolute_get (); | 1929 | now = GNUNET_TIME_absolute_get (); |
1930 | min_remaining = GNUNET_TIME_UNIT_FOREVER_REL; | 1930 | min_remaining = GNUNET_TIME_UNIT_FOREVER_REL; |
1931 | expired = (GNUNET_TIME_absolute_get_duration (last_update).value > (HELLO_ADDRESS_EXPIRATION.value / 4)); | 1931 | expired = (GNUNET_TIME_absolute_get_duration (last_update).rel_value > (HELLO_ADDRESS_EXPIRATION.rel_value / 4)); |
1932 | prev = NULL; | 1932 | prev = NULL; |
1933 | pos = plugin->addresses; | 1933 | pos = plugin->addresses; |
1934 | while (pos != NULL) | 1934 | while (pos != NULL) |
1935 | { | 1935 | { |
1936 | next = pos->next; | 1936 | next = pos->next; |
1937 | if (pos->expires.value < now.value) | 1937 | if (pos->expires.abs_value < now.abs_value) |
1938 | { | 1938 | { |
1939 | expired = GNUNET_YES; | 1939 | expired = GNUNET_YES; |
1940 | if (prev == NULL) | 1940 | if (prev == NULL) |
@@ -1946,7 +1946,7 @@ update_addresses (struct TransportPlugin *plugin, int fresh) | |||
1946 | else | 1946 | else |
1947 | { | 1947 | { |
1948 | remaining = GNUNET_TIME_absolute_get_remaining (pos->expires); | 1948 | remaining = GNUNET_TIME_absolute_get_remaining (pos->expires); |
1949 | if (remaining.value < min_remaining.value) | 1949 | if (remaining.rel_value < min_remaining.rel_value) |
1950 | min_remaining = remaining; | 1950 | min_remaining = remaining; |
1951 | prev = pos; | 1951 | prev = pos; |
1952 | } | 1952 | } |
@@ -2191,7 +2191,7 @@ plugin_env_notify_address (void *cls, | |||
2191 | { | 2191 | { |
2192 | if ((addrlen == al->addrlen) && (0 == memcmp (addr, &al[1], addrlen))) | 2192 | if ((addrlen == al->addrlen) && (0 == memcmp (addr, &al[1], addrlen))) |
2193 | { | 2193 | { |
2194 | if (al->expires.value < abex.value) | 2194 | if (al->expires.abs_value < abex.abs_value) |
2195 | al->expires = abex; | 2195 | al->expires = abex; |
2196 | return; | 2196 | return; |
2197 | } | 2197 | } |
@@ -2631,7 +2631,7 @@ add_to_foreign_address_list (void *cls, | |||
2631 | a2s (tname, addr, addrlen), | 2631 | a2s (tname, addr, addrlen), |
2632 | tname, | 2632 | tname, |
2633 | GNUNET_i2s (&n->id), | 2633 | GNUNET_i2s (&n->id), |
2634 | expiration.value); | 2634 | expiration.abs_value); |
2635 | #endif | 2635 | #endif |
2636 | fal = add_peer_address (n, tname, NULL, addr, addrlen); | 2636 | fal = add_peer_address (n, tname, NULL, addr, addrlen); |
2637 | if (fal == NULL) | 2637 | if (fal == NULL) |
@@ -3364,7 +3364,7 @@ schedule_next_ping (struct ForeignAddressList *fal) | |||
3364 | if (fal->revalidate_task != GNUNET_SCHEDULER_NO_TASK) | 3364 | if (fal->revalidate_task != GNUNET_SCHEDULER_NO_TASK) |
3365 | return; | 3365 | return; |
3366 | delay = GNUNET_TIME_absolute_get_remaining (fal->expires); | 3366 | delay = GNUNET_TIME_absolute_get_remaining (fal->expires); |
3367 | delay.value /= 2; /* do before expiration */ | 3367 | delay.rel_value /= 2; /* do before expiration */ |
3368 | delay = GNUNET_TIME_relative_min (delay, | 3368 | delay = GNUNET_TIME_relative_min (delay, |
3369 | LATENCY_EVALUATION_MAX_DELAY); | 3369 | LATENCY_EVALUATION_MAX_DELAY); |
3370 | if (GNUNET_YES != fal->estimated) | 3370 | if (GNUNET_YES != fal->estimated) |
@@ -3383,7 +3383,7 @@ schedule_next_ping (struct ForeignAddressList *fal) | |||
3383 | delay = GNUNET_TIME_relative_max (delay, | 3383 | delay = GNUNET_TIME_relative_max (delay, |
3384 | GNUNET_TIME_UNIT_SECONDS); | 3384 | GNUNET_TIME_UNIT_SECONDS); |
3385 | /* randomize a bit (to avoid doing all at the same time) */ | 3385 | /* randomize a bit (to avoid doing all at the same time) */ |
3386 | delay.value += GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000); | 3386 | delay.rel_value += GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 1000); |
3387 | fal->revalidate_task = GNUNET_SCHEDULER_add_delayed(sched, | 3387 | fal->revalidate_task = GNUNET_SCHEDULER_add_delayed(sched, |
3388 | delay, | 3388 | delay, |
3389 | &send_periodic_ping, | 3389 | &send_periodic_ping, |
@@ -3627,7 +3627,7 @@ check_pending_validation (void *cls, | |||
3627 | GNUNET_break_op (0); | 3627 | GNUNET_break_op (0); |
3628 | return GNUNET_NO; | 3628 | return GNUNET_NO; |
3629 | } | 3629 | } |
3630 | if (GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh (pong->expiration)).value == 0) | 3630 | if (GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value == 0) |
3631 | { | 3631 | { |
3632 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 3632 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
3633 | _("Received expired signature. Check system time.\n")); | 3633 | _("Received expired signature. Check system time.\n")); |
@@ -3672,10 +3672,10 @@ check_pending_validation (void *cls, | |||
3672 | GNUNET_NO); | 3672 | GNUNET_NO); |
3673 | fal->latency = GNUNET_TIME_absolute_get_duration (ve->send_time); | 3673 | fal->latency = GNUNET_TIME_absolute_get_duration (ve->send_time); |
3674 | schedule_next_ping (fal); | 3674 | schedule_next_ping (fal); |
3675 | if (n->latency.value == GNUNET_TIME_UNIT_FOREVER_REL.value) | 3675 | if (n->latency.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value) |
3676 | n->latency = fal->latency; | 3676 | n->latency = fal->latency; |
3677 | else | 3677 | else |
3678 | n->latency.value = (fal->latency.value + n->latency.value) / 2; | 3678 | n->latency.rel_value = (fal->latency.rel_value + n->latency.rel_value) / 2; |
3679 | 3679 | ||
3680 | n->distance = fal->distance; | 3680 | n->distance = fal->distance; |
3681 | if (GNUNET_NO == n->received_pong) | 3681 | if (GNUNET_NO == n->received_pong) |
@@ -4200,7 +4200,7 @@ process_hello (struct TransportPlugin *plugin, | |||
4200 | { | 4200 | { |
4201 | if (GNUNET_HELLO_equals (hello, | 4201 | if (GNUNET_HELLO_equals (hello, |
4202 | chvc->hello, | 4202 | chvc->hello, |
4203 | GNUNET_TIME_absolute_get ()).value > 0) | 4203 | GNUNET_TIME_absolute_get ()).abs_value > 0) |
4204 | { | 4204 | { |
4205 | #if DEBUG_TRANSPORT_HELLO > 2 | 4205 | #if DEBUG_TRANSPORT_HELLO > 2 |
4206 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4206 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -4500,7 +4500,7 @@ handle_ping(void *cls, const struct GNUNET_MessageHeader *message, | |||
4500 | memcpy (&((char*)&pong[1])[slen], | 4500 | memcpy (&((char*)&pong[1])[slen], |
4501 | sender_address, | 4501 | sender_address, |
4502 | sender_address_len); | 4502 | sender_address_len); |
4503 | if (GNUNET_TIME_absolute_get_remaining (session_header->pong_sig_expires).value < PONG_SIGNATURE_LIFETIME.value / 4) | 4503 | if (GNUNET_TIME_absolute_get_remaining (session_header->pong_sig_expires).rel_value < PONG_SIGNATURE_LIFETIME.rel_value / 4) |
4504 | { | 4504 | { |
4505 | /* create / update cached sig */ | 4505 | /* create / update cached sig */ |
4506 | #if DEBUG_TRANSPORT | 4506 | #if DEBUG_TRANSPORT |
@@ -4568,7 +4568,7 @@ handle_ping(void *cls, const struct GNUNET_MessageHeader *message, | |||
4568 | memcpy (&pong[1], plugin->short_name, slen); | 4568 | memcpy (&pong[1], plugin->short_name, slen); |
4569 | memcpy (&((char*)&pong[1])[slen], addr, alen); | 4569 | memcpy (&((char*)&pong[1])[slen], addr, alen); |
4570 | if ( (oal != NULL) && | 4570 | if ( (oal != NULL) && |
4571 | (GNUNET_TIME_absolute_get_remaining (oal->pong_sig_expires).value < PONG_SIGNATURE_LIFETIME.value / 4) ) | 4571 | (GNUNET_TIME_absolute_get_remaining (oal->pong_sig_expires).rel_value < PONG_SIGNATURE_LIFETIME.rel_value / 4) ) |
4572 | { | 4572 | { |
4573 | /* create / update cached sig */ | 4573 | /* create / update cached sig */ |
4574 | #if DEBUG_TRANSPORT | 4574 | #if DEBUG_TRANSPORT |
@@ -4786,16 +4786,16 @@ plugin_env_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
4786 | } | 4786 | } |
4787 | } | 4787 | } |
4788 | ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 0); | 4788 | ret = GNUNET_BANDWIDTH_tracker_get_delay (&n->in_tracker, 0); |
4789 | if (ret.value > 0) | 4789 | if (ret.rel_value > 0) |
4790 | { | 4790 | { |
4791 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 4791 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4792 | "Throttling read (%llu bytes excess at %u b/s), waiting %llums before reading more.\n", | 4792 | "Throttling read (%llu bytes excess at %u b/s), waiting %llums before reading more.\n", |
4793 | (unsigned long long) n->in_tracker.consumption_since_last_update__, | 4793 | (unsigned long long) n->in_tracker.consumption_since_last_update__, |
4794 | (unsigned int) n->in_tracker.available_bytes_per_s__, | 4794 | (unsigned int) n->in_tracker.available_bytes_per_s__, |
4795 | (unsigned long long) ret.value); | 4795 | (unsigned long long) ret.rel_value); |
4796 | GNUNET_STATISTICS_update (stats, | 4796 | GNUNET_STATISTICS_update (stats, |
4797 | gettext_noop ("# ms throttling suggested"), | 4797 | gettext_noop ("# ms throttling suggested"), |
4798 | (int64_t) ret.value, | 4798 | (int64_t) ret.rel_value, |
4799 | GNUNET_NO); | 4799 | GNUNET_NO); |
4800 | } | 4800 | } |
4801 | return ret; | 4801 | return ret; |