X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-service-transport_validation.c;h=314eefaec2fb7d25dd7a80ab0b8d9373ea7b4f55;hb=f0a8d26b26cda04518e3555373172f6b4940e489;hp=323fd042ab54e60ac09a8ce6c1d1780290a45084;hpb=e5f8178881e8fa8af23574b8303f0396f79c0834;p=oweals%2Fgnunet.git diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c index 323fd042a..314eefaec 100644 --- a/src/transport/gnunet-service-transport_validation.c +++ b/src/transport/gnunet-service-transport_validation.c @@ -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. */ /** @@ -505,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; @@ -517,14 +523,14 @@ 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 sending PING to `%s' `%s' `%s'\n", @@ -542,17 +548,10 @@ transmit_ping_if_allowed (void *cls, } hello = GST_hello_get (); GNUNET_assert (NULL != hello); - 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; 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) + @@ -570,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)); @@ -586,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); @@ -628,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, @@ -639,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); + } } @@ -683,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)); @@ -727,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", @@ -735,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 */ @@ -744,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... */ @@ -790,7 +798,8 @@ find_validation_entry (const struct GNUNET_HELLO_Address *address) 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; } @@ -841,7 +850,8 @@ 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); + 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); @@ -1424,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; @@ -1441,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) { @@ -1472,7 +1485,7 @@ 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); { if (GNUNET_YES == ve->known_to_ats) @@ -1508,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; } @@ -1534,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); @@ -1554,26 +1571,10 @@ GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello) /* got our own HELLO, how boring */ return GNUNET_OK; } - if (GNUNET_NO == - GNUNET_CONTAINER_multipeermap_contains (validation_map, - &pid)) - { - /* Add peer identity without addresses to peerinfo service */ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Adding HELLO without addresses for peer `%s'\n", - GNUNET_i2s (&pid)); - h = GNUNET_HELLO_create (&pid.public_key, NULL, NULL, friend); - GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL); - - GNUNET_free (h); - } - else - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Validation received HELLO message for peer `%s' with size %u, checking for new addresses\n", - GNUNET_i2s (&pid), - ntohs (hello->size)); - } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "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,