/*
This file is part of GNUnet.
- Copyright (C) 2010-2015 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2015 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.
*/
/**
#include "gnunet_peerinfo_service.h"
#include "gnunet_signatures.h"
+/**
+ * Current state of a validation process.
+ *
+ * FIXME: what state is used to indicate that a validation
+ * was successful? If that is clarified/determined, "UGH" in
+ * ~gnunetpeerinfogtk.c:1103 should be resolved.
+ */
+enum GNUNET_TRANSPORT_ValidationState
+{
+ /**
+ * Undefined state
+ *
+ * Used for final callback indicating operation done
+ */
+ GNUNET_TRANSPORT_VS_NONE,
+
+ /**
+ * Fresh validation entry
+ *
+ * Entry was just created, no validation process was executed
+ */
+ GNUNET_TRANSPORT_VS_NEW,
+
+ /**
+ * Updated validation entry
+ *
+ * This is an update for an existing validation entry
+ */
+ GNUNET_TRANSPORT_VS_UPDATE,
+
+ /**
+ * Timeout for validation entry
+ *
+ * A timeout occured during the validation process
+ */
+ GNUNET_TRANSPORT_VS_TIMEOUT,
+
+ /**
+ * Validation entry is removed
+ *
+ * The validation entry is getting removed due to a failed validation
+ */
+ GNUNET_TRANSPORT_VS_REMOVE
+};
+
+
+
/**
* How long is a PONG signature valid? We'll recycle a signature until
enum GNUNET_TRANSPORT_ValidationState state)
{
ve->state = state;
- GST_clients_broadcast_validation_notification (&ve->address->peer,
- ve->address,
- ve->send_time,
- ve->valid_until,
- ve->next_validation,
- state);
}
if (GNUNET_YES == ve->known_to_ats)
{
GST_ats_expire_address (ve->address);
+ GNUNET_assert (GNUNET_NO ==
+ GST_ats_is_known_no_session (ve->address));
ve->known_to_ats = GNUNET_NO;
}
GNUNET_HELLO_address_free (ve->address);
* longer valid and then possibly triggers its removal.
*
* @param cls the `struct ValidationEntry`
- * @param tc scheduler context (unused)
*/
static void
-timeout_hello_validation (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+timeout_hello_validation (void *cls)
{
struct ValidationEntry *ve = cls;
struct GNUNET_TIME_Absolute max;
transmit_ping_if_allowed (void *cls,
const struct GNUNET_PeerIdentity *pid,
const struct GNUNET_HELLO_Address *address_null,
- struct Session *session_null,
+ struct GNUNET_ATS_Session *session_null,
int result)
{
struct ValidationEntry *ve = cls;
size_t tsize;
size_t slen;
uint16_t hsize;
- struct Session *session;
+ struct GNUNET_ATS_Session *session;
ve->bc = NULL;
if (GNUNET_OK != result)
NULL, NULL);
if (-1 == ret)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Failed to send PING to `%s' at `%s'\n",
GNUNET_i2s (pid),
GST_plugins_a2s (ve->address));
* Do address validation again to keep address valid.
*
* @param cls the `struct ValidationEntry`
- * @param tc scheduler context (unused)
*/
static void
-revalidate_address (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+revalidate_address (void *cls)
{
struct ValidationEntry *ve = cls;
struct GNUNET_TIME_Relative canonical_delay;
&validation_entry_match, &vemc);
if (NULL != (ve = vemc.ve))
return ve;
+ GNUNET_assert (GNUNET_NO ==
+ GST_ats_is_known_no_session (address));
ve = GNUNET_new (struct ValidationEntry);
ve->in_use = GNUNET_SYSERR; /* not defined */
ve->address = GNUNET_HELLO_address_copy (address);
ve->pong_sig_valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
- memset (&ve->pong_sig_cache, '\0', sizeof (struct GNUNET_CRYPTO_EddsaSignature));
+ memset (&ve->pong_sig_cache,
+ '\0',
+ sizeof (struct GNUNET_CRYPTO_EddsaSignature));
ve->latency = GNUNET_TIME_UNIT_FOREVER_REL;
ve->challenge =
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
struct ValidationEntry *ve;
struct GNUNET_PeerIdentity pid;
struct GNUNET_ATS_Properties prop;
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
return GNUNET_OK; /* expired */
GNUNET_break (0);
return GNUNET_OK; /* invalid HELLO !? */
}
- if (NULL == GST_plugins_find (address->transport_name))
+ if (NULL == (papi = GST_plugins_find (address->transport_name)))
{
/* might have been valid in the past, but we don't have that
plugin loaded right now */
return GNUNET_OK;
}
+ if (NULL ==
+ papi->address_to_string (papi->cls,
+ address->address,
+ address->address_length))
+ {
+ /* Why do we try to add an ill-formed address? */
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Address with %u bytes for plugin %s and peer %s is malformed\n",
+ (unsigned int) address->address_length,
+ address->transport_name,
+ GNUNET_i2s (&pid));
+ return GNUNET_OK;
+ }
ve = find_validation_entry (address);
+ ve->network = papi->get_network_for_address (papi->cls,
+ address);
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != ve->network);
ve->valid_until = GNUNET_TIME_absolute_max (ve->valid_until,
expiration);
if (NULL == ve->revalidation_task)
{
ve->known_to_ats = GNUNET_YES;
GST_ats_add_address (address, &prop);
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known_no_session (ve->address));
}
return GNUNET_OK;
}
{
struct TransportPongMessage *pong = cls;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct Session *session;
+ struct GNUNET_ATS_Session *session;
papi = GST_plugins_find (address->transport_name);
if (NULL == papi)
GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *hdr,
const struct GNUNET_HELLO_Address *sender_address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
const struct TransportPingMessage *ping;
struct TransportPongMessage *pong;
ssize_t ret;
struct GNUNET_HELLO_Address address;
+ if (0 ==
+ memcmp (&GST_my_identity,
+ sender,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return GNUNET_OK; /* our own, ignore! */
if (ntohs (hdr->size) < sizeof (struct TransportPingMessage))
{
GNUNET_break_op (0);
int sig_res;
int do_verify;
+ if (0 ==
+ memcmp (&GST_my_identity,
+ sender,
+ sizeof (struct GNUNET_PeerIdentity)))
+ return GNUNET_OK; /* our own, ignore! */
+
if (ntohs (hdr->size) < sizeof (struct TransportPongMessage))
{
GNUNET_break_op (0);
{
/* 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;
{
/* 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)
{
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)
{
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known_no_session (ve->address));
GST_ats_update_delay (ve->address,
GNUNET_TIME_relative_divide (ve->latency, 2));
}
struct GNUNET_ATS_Properties prop;
memset (&prop, 0, sizeof (prop));
+ GNUNET_break (GNUNET_ATS_NET_UNSPECIFIED != ve->network);
prop.scope = ve->network;
prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
+ GNUNET_assert (GNUNET_NO ==
+ GST_ats_is_known_no_session (ve->address));
ve->known_to_ats = GNUNET_YES;
GST_ats_add_address (ve->address, &prop);
+ GNUNET_assert (GNUNET_YES ==
+ GST_ats_is_known_no_session (ve->address));
}
}
if (validations_running > 0)
/* 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;
}
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);
/* 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,
}
-/**
- * Closure for the validation_entries_iterate function.
- */
-struct ValidationIteratorContext
-{
- /**
- * Function to call on each validation entry
- */
- GST_ValidationChangedCallback cb;
-
- /**
- * Closure for @e cb.
- */
- void *cb_cls;
-};
-
-
-/**
- * Function called on each entry in the validation map.
- * Passes the information from the validation entry to
- * the callback given in the closure.
- *
- * @param cls the `struct ValidationIteratorContext`
- * @param key peer this is about
- * @param value the `struct ValidationEntry`
- * @return #GNUNET_OK (continue to iterate)
- */
-static int
-validation_entries_iterate (void *cls,
- const struct GNUNET_PeerIdentity *key,
- void *value)
-{
- struct ValidationIteratorContext *ic = cls;
- struct ValidationEntry *ve = value;
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Notifying about validation entry for peer `%s' address `%s' \n",
- GNUNET_i2s (&ve->address->peer),
- GST_plugins_a2s (ve->address));
- ic->cb (ic->cb_cls,
- ve->address,
- ve->send_time,
- ve->valid_until,
- ve->next_validation,
- ve->state);
- return GNUNET_OK;
-}
-
-
-/**
- * Iterate over all iteration entries
- *
- * @param cb function to call
- * @param cb_cls closure for @a cb
- */
-void
-GST_validation_iterate (GST_ValidationChangedCallback cb,
- void *cb_cls)
-{
- struct ValidationIteratorContext ic;
-
- if (NULL == validation_map)
- return; /* can happen during shutdown */
- ic.cb = cb;
- ic.cb_cls = cb_cls;
- GNUNET_CONTAINER_multipeermap_iterate (validation_map,
- &validation_entries_iterate,
- &ic);
-}
-
/* end of file gnunet-service-transport_validation.c */
projects / oweals / gnunet.git / blobdiff