X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-service-transport_validation.c;h=314eefaec2fb7d25dd7a80ab0b8d9373ea7b4f55;hb=f0a8d26b26cda04518e3555373172f6b4940e489;hp=b2948d0869ccd28db9deccbe0e1344063588ad49;hpb=ffd9516faaaa7d2a9595039d10a759bb07988b77;p=oweals%2Fgnunet.git diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index b2948d086..314eefaec 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2010-2015 Christian Grothoff (and other contributing authors) + Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /** @@ -413,7 +413,8 @@ cleanup_validation_entry (void *cls, ve->valid_until = GNUNET_TIME_UNIT_ZERO_ABS; /* Notify about deleted entry */ - validation_entry_changed (ve, GNUNET_TRANSPORT_VS_REMOVE); + validation_entry_changed (ve, + GNUNET_TRANSPORT_VS_REMOVE); if (NULL != ve->bc) { @@ -449,9 +450,6 @@ cleanup_validation_entry (void *cls, gettext_noop ("# validations running"), validations_running, GNUNET_NO); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Validation finished, %u validation processes running\n", - validations_running); } GNUNET_free (ve); return GNUNET_OK; @@ -474,20 +472,30 @@ timeout_hello_validation (void *cls, struct GNUNET_TIME_Relative left; ve->timeout_task = NULL; + /* For valid addresses, we want to wait until the expire; + for addresses under PING validation, we want to wait + until we give up on the PING */ max = GNUNET_TIME_absolute_max (ve->valid_until, ve->revalidation_block); left = GNUNET_TIME_absolute_get_remaining (max); if (left.rel_value_us > 0) { - /* should wait a bit longer */ + /* We should wait a bit longer. This happens when + address lifetimes are extended due to successful + validations. */ ve->timeout_task = - GNUNET_SCHEDULER_add_delayed (left, &timeout_hello_validation, ve); + GNUNET_SCHEDULER_add_delayed (left, + &timeout_hello_validation, + ve); return; } GNUNET_STATISTICS_update (GST_stats, - gettext_noop ("# address records discarded"), 1, + gettext_noop ("# address records discarded (timeout)"), + 1, GNUNET_NO); - cleanup_validation_entry (NULL, &ve->address->peer, ve); + cleanup_validation_entry (NULL, + &ve->address->peer, + ve); } @@ -497,11 +505,17 @@ timeout_hello_validation (void *cls, * * @param cls our `struct ValidationEntry` * @param pid identity of the other peer - * @param result #GNUNET_OK if the connection is allowed, #GNUNET_NO if not + * @param address_null address associated with the request, always NULL + * @param session_null session associated with the request, always NULL + * @param result #GNUNET_OK if the connection is allowed, + * #GNUNET_NO if not, + * #GNUNET_SYSERR if operation was aborted */ static void transmit_ping_if_allowed (void *cls, const struct GNUNET_PeerIdentity *pid, + const struct GNUNET_HELLO_Address *address_null, + struct Session *session_null, int result) { struct ValidationEntry *ve = cls; @@ -509,36 +523,35 @@ transmit_ping_if_allowed (void *cls, struct GNUNET_TRANSPORT_PluginFunctions *papi; struct GNUNET_TIME_Absolute next; const struct GNUNET_MessageHeader *hello; - enum GNUNET_ATS_Network_Type network; ssize_t ret; size_t tsize; size_t slen; uint16_t hsize; + struct Session *session; ve->bc = NULL; - if (GNUNET_NO == result) + if (GNUNET_OK != result) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Blacklist denies to send PING to `%s' `%s' `%s'\n", + "Blacklist denies sending PING to `%s' `%s' `%s'\n", GNUNET_i2s (pid), GST_plugins_a2s (ve->address), ve->address->transport_name); - cleanup_validation_entry (NULL, pid, ve); + GNUNET_STATISTICS_update (GST_stats, + gettext_noop ("# address records discarded (blacklist)"), + 1, + GNUNET_NO); + cleanup_validation_entry (NULL, + pid, + ve); return; } - - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting plain PING to `%s' `%s' `%s'\n", - GNUNET_i2s (pid), - GST_plugins_a2s (ve->address), - ve->address->transport_name); - - slen = strlen (ve->address->transport_name) + 1; hello = GST_hello_get (); + GNUNET_assert (NULL != hello); + slen = strlen (ve->address->transport_name) + 1; hsize = ntohs (hello->size); - tsize = - sizeof (struct TransportPingMessage) + ve->address->address_length + - slen + hsize; + tsize = sizeof (struct TransportPingMessage) + + ve->address->address_length + slen + hsize; ping.header.size = htons (sizeof (struct TransportPingMessage) + @@ -556,11 +569,11 @@ transmit_ping_if_allowed (void *cls, slen + hsize; } { - char message_buf[tsize]; + char message_buf[tsize] GNUNET_ALIGN; - /* build message with structure: - * [HELLO][TransportPingMessage][Transport name][Address] */ - memcpy (message_buf, hello, hsize); + memcpy (message_buf, + hello, + hsize); memcpy (&message_buf[hsize], &ping, sizeof (struct TransportPingMessage)); @@ -572,40 +585,42 @@ transmit_ping_if_allowed (void *cls, ve->address->address_length); papi = GST_plugins_find (ve->address->transport_name); GNUNET_assert (NULL != papi); - GNUNET_assert (NULL != papi->send); - struct Session *session = papi->get_session (papi->cls, - ve->address); - - if (NULL != session) - { - ret = papi->send (papi->cls, session, - message_buf, tsize, - PING_PRIORITY, - ACCEPTABLE_PING_DELAY, - NULL, NULL); - network = papi->get_network (papi->cls, session); - if (GNUNET_ATS_NET_UNSPECIFIED == network) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Could not obtain a valid network for `%s' `%s'\n", - GNUNET_i2s (pid), - GST_plugins_a2s (ve->address)); - GNUNET_break(0); - } - GST_neighbours_notify_data_sent (ve->address, session, tsize); - } - else + session = papi->get_session (papi->cls, + ve->address); + if (NULL == session) { /* Could not get a valid session */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Could not get a valid session for `%s' `%s'\n", + "Failed to get session to send PING to `%s' at `%s'\n", GNUNET_i2s (pid), GST_plugins_a2s (ve->address)); - ret = -1; + return; } - } - if (-1 != ret) - { + + ret = papi->send (papi->cls, session, + message_buf, tsize, + PING_PRIORITY, + ACCEPTABLE_PING_DELAY, + NULL, NULL); + if (-1 == ret) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Failed to send PING to `%s' at `%s'\n", + GNUNET_i2s (pid), + GST_plugins_a2s (ve->address)); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitted plain PING to `%s' `%s' `%s'\n", + GNUNET_i2s (pid), + GST_plugins_a2s (ve->address), + ve->address->transport_name); + ve->network = papi->get_network (papi->cls, + session); + GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != ve->network); + GST_neighbours_notify_data_sent (ve->address, + session, + tsize); next = GNUNET_TIME_relative_to_absolute (validation_delay); validation_next = GNUNET_TIME_absolute_max (next, validation_next); @@ -614,7 +629,6 @@ transmit_ping_if_allowed (void *cls, gettext_noop ("# PINGs for address validation sent"), 1, GNUNET_NO); - ve->network = network; ve->expecting_pong = GNUNET_YES; validations_running++; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -625,7 +639,9 @@ transmit_ping_if_allowed (void *cls, validations_running, GNUNET_NO); /* Notify about PING sent */ - validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE); + validation_entry_changed (ve, + GNUNET_TRANSPORT_VS_UPDATE); + } } @@ -669,7 +685,7 @@ revalidate_address (void *cls, { /* should wait a bit longer */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Waiting for %s longer before validating address `%s'\n", + "Waiting for %s longer before (re)validating address `%s'\n", GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES), GST_plugins_a2s (ve->address)); @@ -696,7 +712,9 @@ revalidate_address (void *cls, 1, GNUNET_NO); ve->revalidation_task = - GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve); + GNUNET_SCHEDULER_add_delayed (blocked_for, + &revalidate_address, + ve); ve->next_validation = GNUNET_TIME_relative_to_absolute (blocked_for); return; } @@ -711,7 +729,8 @@ revalidate_address (void *cls, delay = GNUNET_TIME_relative_add (canonical_delay, GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_MICROSECONDS, rdelay)); + (GNUNET_TIME_UNIT_MICROSECONDS, + rdelay)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Validating now, next scheduled for %s, now validating address `%s'\n", @@ -719,7 +738,9 @@ revalidate_address (void *cls, GNUNET_YES), GST_plugins_a2s (ve->address)); ve->revalidation_task = - GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve); + GNUNET_SCHEDULER_add_delayed (delay, + &revalidate_address, + ve); ve->next_validation = GNUNET_TIME_relative_to_absolute (delay); /* start PINGing by checking blacklist */ @@ -728,7 +749,10 @@ revalidate_address (void *cls, GNUNET_NO); bc = GST_blacklist_test_allowed (&ve->address->peer, ve->address->transport_name, - &transmit_ping_if_allowed, ve); + &transmit_ping_if_allowed, + ve, + NULL, + NULL); if (NULL != bc) ve->bc = bc; /* only set 'bc' if 'transmit_ping_if_allowed' was not already * called... */ @@ -767,12 +791,15 @@ find_validation_entry (const struct GNUNET_HELLO_Address *address) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); ve->timeout_task = GNUNET_SCHEDULER_add_delayed (UNVALIDATED_PING_KEEPALIVE, - &timeout_hello_validation, ve); - GNUNET_CONTAINER_multipeermap_put (validation_map, &address->peer, + &timeout_hello_validation, + ve); + GNUNET_CONTAINER_multipeermap_put (validation_map, + &address->peer, ve, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); publish_ve_stat_update (); - validation_entry_changed (ve, GNUNET_TRANSPORT_VS_NEW); + validation_entry_changed (ve, + GNUNET_TRANSPORT_VS_NEW); return ve; } @@ -796,7 +823,7 @@ add_valid_address (void *cls, const struct GNUNET_HELLO_Message *hello = cls; struct ValidationEntry *ve; struct GNUNET_PeerIdentity pid; - struct GNUNET_ATS_Information ats; + struct GNUNET_ATS_Properties prop; if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us) return GNUNET_OK; /* expired */ @@ -823,14 +850,15 @@ add_valid_address (void *cls, ve->next_validation = GNUNET_TIME_absolute_get(); ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve); } - validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE); - - ats.type = htonl (GNUNET_ATS_NETWORK_TYPE); - ats.value = htonl (ve->network); + validation_entry_changed (ve, + GNUNET_TRANSPORT_VS_UPDATE); + memset (&prop, 0, sizeof (prop)); + prop.scope = ve->network; + prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2); if (GNUNET_YES != ve->known_to_ats) { ve->known_to_ats = GNUNET_YES; - GST_ats_add_address (address, NULL, &ats, 1); + GST_ats_add_address (address, &prop); } return GNUNET_OK; } @@ -900,7 +928,7 @@ GST_validation_start (unsigned int max_fds) validations_running, GNUNET_NO); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Validation uses a fast start threshold of %u connections and a delay between of %s\n ", + "Validation uses a fast start threshold of %u connections and a delay of %s\n", validations_fast_start_threshold, GNUNET_STRINGS_relative_time_to_string (validation_delay, GNUNET_YES)); @@ -1229,6 +1257,35 @@ GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender, } +/** + * Validate an individual address. + * + * @param address address we should try to validate + */ +void +GST_validation_handle_address (const struct GNUNET_HELLO_Address *address) +{ + struct GNUNET_TRANSPORT_PluginFunctions *papi; + struct ValidationEntry *ve; + + papi = GST_plugins_find (address->transport_name); + if (NULL == papi) + { + /* This plugin is currently unvailable ... ignore */ + return; + } + ve = find_validation_entry (address); + if (NULL == ve->revalidation_task) + { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Validation process started for fresh address `%s' of %s\n", + GST_plugins_a2s (ve->address), + GNUNET_i2s (&ve->address->peer)); + ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve); + } +} + + /** * Iterator callback to go over all addresses and try to validate them * (unless blocked or already validated). @@ -1243,29 +1300,13 @@ validate_address_iterator (void *cls, const struct GNUNET_HELLO_Address *address, struct GNUNET_TIME_Absolute expiration) { - struct GNUNET_TRANSPORT_PluginFunctions * papi; - struct ValidationEntry *ve; - if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Skipping expired address from HELLO\n"); return GNUNET_OK; /* expired */ } - papi = GST_plugins_find (address->transport_name); - if (NULL == papi) - { - /* This plugin is currently unvailable ... ignore */ - return GNUNET_OK; - } - ve = find_validation_entry (address); - if (NULL == ve->revalidation_task) - { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Validation process started for fresh address `%s'\n", - GST_plugins_a2s (ve->address)); - ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve); - } + GST_validation_handle_address (address); return GNUNET_OK; } @@ -1393,7 +1434,9 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, { /* We have a cached and valid signature for this peer, * try to compare instead of verify */ - if (0 == memcmp (&ve->pong_sig_cache, &pong->signature, sizeof (struct GNUNET_CRYPTO_EddsaSignature))) + if (0 == memcmp (&ve->pong_sig_cache, + &pong->signature, + sizeof (struct GNUNET_CRYPTO_EddsaSignature))) { /* signatures are identical, we can skip verification */ sig_res = GNUNET_OK; @@ -1410,7 +1453,8 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, { /* Do expensive verification */ sig_res = GNUNET_CRYPTO_eddsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, - &pong->purpose, &pong->signature, + &pong->purpose, + &pong->signature, &ve->address->peer.public_key); if (sig_res == GNUNET_SYSERR) { @@ -1441,23 +1485,23 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, ve->expecting_pong = GNUNET_NO; ve->valid_until = GNUNET_TIME_relative_to_absolute (HELLO_ADDRESS_EXPIRATION); ve->pong_sig_cache = pong->signature; - ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration); + ve->pong_sig_valid_until = GNUNET_TIME_absolute_ntoh (pong->expiration); ve->latency = GNUNET_TIME_absolute_get_duration (ve->send_time); { - struct GNUNET_ATS_Information ats[2]; - - ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY); - ats[0].value = htonl ((uint32_t) ve->latency.rel_value_us); - ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE); - ats[1].value = htonl ((uint32_t) ve->network); if (GNUNET_YES == ve->known_to_ats) { - GST_ats_update_metrics (ve->address, NULL, ats, 2); + GST_ats_update_delay (ve->address, + GNUNET_TIME_relative_divide (ve->latency, 2)); } else { + struct GNUNET_ATS_Properties prop; + + memset (&prop, 0, sizeof (prop)); + prop.scope = ve->network; + prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2); ve->known_to_ats = GNUNET_YES; - GST_ats_add_address (ve->address, NULL, ats, 2); + GST_ats_add_address (ve->address, &prop); } } if (validations_running > 0) @@ -1477,14 +1521,19 @@ GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender, } /* Notify about new validity */ - validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE); + validation_entry_changed (ve, + GNUNET_TRANSPORT_VS_UPDATE); /* build HELLO to store in PEERINFO */ ve->copied = GNUNET_NO; hello = GNUNET_HELLO_create (&ve->address->peer.public_key, - &add_valid_peer_address, ve, + &add_valid_peer_address, + ve, GNUNET_NO); - GNUNET_PEERINFO_add_peer (GST_peerinfo, hello, NULL, NULL); + GNUNET_PEERINFO_add_peer (GST_peerinfo, + hello, + NULL, + NULL); GNUNET_free (hello); return GNUNET_OK; } @@ -1503,7 +1552,6 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello) const struct GNUNET_HELLO_Message *hm = (const struct GNUNET_HELLO_Message *) hello; struct GNUNET_PeerIdentity pid; - struct GNUNET_HELLO_Message *h; int friend; friend = GNUNET_HELLO_is_friend_only (hm); @@ -1519,21 +1567,14 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello) memcmp (&GST_my_identity, &pid, sizeof (struct GNUNET_PeerIdentity))) + { + /* got our own HELLO, how boring */ return GNUNET_OK; - /* Add peer identity without addresses to peerinfo service */ - h = GNUNET_HELLO_create (&pid.public_key, NULL, NULL, friend); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Validation received new %s message for peer `%s' with size %u\n"), - "HELLO", - GNUNET_i2s (&pid), - ntohs (hello->size)); - GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL); - + } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Adding `%s' without addresses for peer `%s'\n"), "HELLO", - GNUNET_i2s (&pid)); - - GNUNET_free (h); + "Validation received HELLO message for peer `%s' with size %u, checking for new addresses\n", + GNUNET_i2s (&pid), + ntohs (hello->size)); GNUNET_assert (NULL == GNUNET_HELLO_iterate_addresses (hm, GNUNET_NO, @@ -1638,66 +1679,20 @@ GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address, GNUNET_break (0); return; } - if (ve->in_use == in_use) - { - if (GNUNET_YES == in_use) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error setting address in use for peer `%s' `%s' to USED\n", - GNUNET_i2s (&address->peer), GST_plugins_a2s (address)); - } - if (GNUNET_NO == in_use) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Error setting address in use for peer `%s' `%s' to NOT_USED\n", - GNUNET_i2s (&address->peer), GST_plugins_a2s (address)); - } - } - - GNUNET_break (ve->in_use != in_use); /* should be different... */ + if (in_use == ve->in_use) + return; ve->in_use = in_use; - if (in_use == GNUNET_YES) + if (GNUNET_YES == in_use) { /* from now on, higher frequeny, so reschedule now */ if (NULL != ve->revalidation_task) GNUNET_SCHEDULER_cancel (ve->revalidation_task); - ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve); + ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, + ve); } } -/** - * Query validation about the latest observed latency on a given - * address. - * - * @param address the address - * @param session session - * @return observed latency of the address, FOREVER if the address was - * never successfully validated - */ -struct GNUNET_TIME_Relative -GST_validation_get_address_latency (const struct GNUNET_HELLO_Address *address, - struct Session *session) -{ - struct ValidationEntry *ve; - - if (NULL == address) - { - GNUNET_break (0); - return GNUNET_TIME_UNIT_FOREVER_REL; - } - if (NULL == GST_plugins_find (address->transport_name)) - { - GNUNET_break (0); /* but we don't have the plugin! */ - return GNUNET_TIME_UNIT_FOREVER_REL; - } - - ve = find_validation_entry (address); - if (NULL == ve) - return GNUNET_TIME_UNIT_FOREVER_REL; - return ve->latency; -} - /** * Closure for the validation_entries_iterate function. */ @@ -1751,7 +1746,7 @@ validation_entries_iterate (void *cls, * Iterate over all iteration entries * * @param cb function to call - * @param cb_cls closure for cb + * @param cb_cls closure for @a cb */ void GST_validation_iterate (GST_ValidationChangedCallback cb,