#include "gnunet_peerinfo_service.h"
#include "gnunet_signatures.h"
-#define KEEP_093_COMPATIBILITY GNUNET_NO
/**
* How long is a PONG signature valid? We'll recycle a signature until
*/
struct GNUNET_PeerIdentity pid;
+ /**
+ * Cached PONG signature
+ */
+ struct GNUNET_CRYPTO_EccSignature pong_sig_cache;
+
/**
* ID of task that will clean up this entry if nothing happens.
*/
*/
struct GNUNET_TIME_Absolute valid_until;
+ /**
+ * Until when is the cached PONG signature valid?
+ * ZERO if it is not currently considered valid.
+ */
+ struct GNUNET_TIME_Absolute pong_sig_valid_until;
+
/**
* How long until we can try to validate this address again?
* FOREVER if the address is for an unsupported plugin (from PEERINFO)
/* FIXME: DEBUGGING */
int last_line_set_to_no;
int last_line_set_to_yes;
+
+ enum GNUNET_ATS_Network_Type network;
};
*/
static struct GNUNET_TIME_Relative validation_delay;
+/**
+ * Number of validations running
+ */
+static unsigned int validations_running;
+
+/**
+ * Validition fast start threshold
+ */
+static unsigned int validations_fast_start_threshold;
+
/**
* When is next validation allowed
*/
GNUNET_SCHEDULER_cancel (ve->revalidation_task);
ve->revalidation_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if ((GNUNET_YES == ve->expecting_pong) &&
+ (validations_running > 0))
+ {
+ validations_running --;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Validation finished, %u validation processes running\n",
+ validations_running);
+ }
GNUNET_free (ve);
return GNUNET_OK;
}
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;
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);
- next = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), validation_delay);
+ next = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get(), validation_delay);
if (next.abs_value > validation_next.abs_value)
validation_next = next; /* We're going to send a PING so delay next validation */
message_buf, tsize,
PING_PRIORITY, ACCEPTABLE_PING_DELAY,
NULL, NULL);
+ network = papi->get_network (ve->address, session);
+ if (GNUNET_ATS_NET_UNSPECIFIED == network)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not obtain a valid network for `%s' %s\n",
+ GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+ GNUNET_break (0);
+ }
}
else
{
gettext_noop
("# PING without HELLO messages sent"), 1,
GNUNET_NO);
+
+ ve->network = network;
ve->expecting_pong = GNUNET_YES;
+ validations_running ++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Validation started, %u validation processes running\n",
+ validations_running);
}
}
return;
}
blocked_for = GNUNET_TIME_absolute_get_remaining(validation_next);
- if ((blocked_for.rel_value) > 0)
+ if ((validations_running > validations_fast_start_threshold) &&
+ (blocked_for.rel_value > 0))
{
- /* Validations are blocked, have to wait for blocked_for ms */
- ve->revalidation_task =
- GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve);
- return;
+ /* Validations are blocked, have to wait for blocked_for time */
+ ve->revalidation_task =
+ GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve);
+ return;
}
ve->revalidation_block = GNUNET_TIME_relative_to_absolute (canonical_delay);
ve->address = GNUNET_HELLO_address_copy (address);
ve->public_key = *public_key;
ve->pid = address->peer;
+ ve->pong_sig_valid_until = GNUNET_TIME_absolute_get_zero_();
+ memset (&ve->pong_sig_cache, '\0', sizeof (struct GNUNET_CRYPTO_EccSignature));
ve->latency = GNUNET_TIME_UNIT_FOREVER_REL;
ve->challenge =
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
const struct GNUNET_HELLO_Message *hello = cls;
struct ValidationEntry *ve;
struct GNUNET_PeerIdentity pid;
+ struct GNUNET_ATS_Information ats;
struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
if (GNUNET_TIME_absolute_get_remaining (expiration).rel_value == 0)
if (GNUNET_SCHEDULER_NO_TASK == ve->revalidation_task)
ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
- GNUNET_ATS_address_add (GST_ats, address, NULL, NULL, 0);
+
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl (ve->network);
+ GNUNET_ATS_address_add (GST_ats, address, NULL, &ats, 1);
+
return GNUNET_OK;
}
void
GST_validation_start (unsigned int max_fds)
{
+ /**
+ * Initialization for validation throttling
+ *
+ * We have a maximum number max_fds of connections we can use for validation
+ * We monitor the number of validations in parallel and start to throttle it
+ * when doing to many validations in parallel:
+ * if (running validations < (max_fds / 2))
+ * - "fast start": run validation immediately
+ * - have delay of (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value) / (max_fds / 2)
+ * (300 sec / ~150 == ~2 sec.) between two validations
+ */
+
validation_next = GNUNET_TIME_absolute_get();
- validation_delay.rel_value = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value) / max_fds;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Delay between validations: %u ms\n ", validation_delay.rel_value);
+ validation_delay.rel_value = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value) / (max_fds / 2);
+ validations_fast_start_threshold = (max_fds / 2);
+ validations_running = 0;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Validation uses a fast start threshold of %u connections and a delay between of %u ms\n ",
+ validations_fast_start_threshold, validation_delay.rel_value);
validation_map = GNUNET_CONTAINER_multihashmap_create (VALIDATION_MAP_SIZE,
GNUNET_NO);
- pnc = GNUNET_PEERINFO_notify (GST_cfg, &process_peerinfo_hello, NULL);
+ pnc = GNUNET_PEERINFO_notify (GST_cfg, GNUNET_YES, &process_peerinfo_hello, NULL);
}
struct GNUNET_TIME_Absolute *sig_cache_exp;
const char *addr;
const char *addrend;
+ char *plugin_name;
+ char *pos;
size_t alen;
size_t slen;
ssize_t ret;
sig_cache = NULL;
sig_cache_exp = NULL;
-
+ papi = NULL;
if (alen > 0)
{
addrend = memchr (addr, '\0', alen);
address.transport_name = addr;
address.peer = GST_my_identity;
+ if (NULL == address.transport_name)
+ {
+ GNUNET_break (0);
+ }
+
+ if (0 != strstr (address.transport_name, "_client"))
+ {
+ plugin_name = GNUNET_strdup (address.transport_name);
+ pos = strstr (plugin_name, "_client");
+ GNUNET_assert (NULL != pos);
+ GNUNET_snprintf (pos, strlen ("_server") + 1, "%s", "_server");
+ }
+ else
+ plugin_name = GNUNET_strdup (address.transport_name);
+
+ if (NULL == (papi = GST_plugins_find (plugin_name)))
+ {
+ /* we don't have the plugin for this address */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Plugin `%s' not available, cannot confirm having this address \n",
+ plugin_name);
+ GNUNET_free (plugin_name);
+ return;
+ }
+ GNUNET_free (plugin_name);
+ if (GNUNET_OK != papi->check_address (papi->cls, addrend, alen))
+ {
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# failed address checks during validation"), 1,
+ GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Address `%s' is not one of my addresses, not confirming PING\n",
+ GST_plugins_a2s (&address));
+ return;
+ }
+ else
+ {
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop
+ ("# successful address checks during validation"), 1,
+ GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Address `%s' is one of my addresses, confirming PING\n",
+ GST_plugins_a2s (&address));
+ }
if (GNUNET_YES != GST_hello_test_address (&address, &sig_cache, &sig_cache_exp))
{
-#if KEEP_093_COMPATIBILITY
- int idsize = sizeof (GST_my_identity);
- if (alen <= idsize)
- {
- if (0 == memcmp (address.address, &GST_my_identity, alen))
- buggy = GNUNET_YES;
- }
- else if (alen <= (idsize + strlen (address.transport_name)))
- {
- char *achar = (char *) &address.address;
- if ((0 == memcmp (address.address, &GST_my_identity, idsize)) &&
- (0 == memcmp (&achar[idsize], address.transport_name, alen - idsize)))
- buggy = GNUNET_YES;
- }
- else
- {
- /* Not predicatable */
- return;
- }
-#endif
if (GNUNET_NO == buggy)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
memcpy (&pong->challenge, &ping->challenge, sizeof (ping->challenge));
pong->addrlen = htonl (alen + slen);
memcpy (&pong[1], addr, slen); /* Copy transport plugin */
-#if KEEP_093_COMPATIBILITY
- if (GNUNET_YES == buggy)
+ if (alen > 0)
{
- int idsize = sizeof (GST_my_identity);
- if (alen <= idsize)
- {
- memcpy (&((char *) &pong[1])[slen], &GST_my_identity, alen);
- }
- else if (alen <= (idsize + strlen (address.transport_name) + 1))
- {
- memcpy (&((char *) &pong[1])[slen], &GST_my_identity, idsize);
- memcpy (&((char *) &pong[1])[slen + idsize], address.transport_name, alen-idsize);
- }
- else
- {
- /* If this would happen, we would have a inconsistent PING we cannot reproduce */
- GNUNET_free (pong);
- return;
- }
-
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating buggy PONG signature to indicate ownership.\n");
- pong->expiration = GNUNET_TIME_absolute_hton (GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME));
+ GNUNET_assert (NULL != addrend);
+ memcpy (&((char *) &pong[1])[slen], addrend, alen);
+ }
+ if (GNUNET_TIME_absolute_get_remaining (*sig_cache_exp).rel_value <
+ PONG_SIGNATURE_LIFETIME.rel_value / 4)
+ {
+ /* create / update cached sig */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating PONG signature to indicate ownership.\n");
+ *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME);
+ pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_ecc_sign (GST_my_private_key, &pong->purpose,
- &pong->signature));
+ GNUNET_CRYPTO_ecc_sign (GST_my_private_key, &pong->purpose,
+ sig_cache));
}
else
{
-#endif
- if (alen > 0)
- {
- GNUNET_assert (NULL != addrend);
- memcpy (&((char *) &pong[1])[slen], addrend, alen);
- }
- if (GNUNET_TIME_absolute_get_remaining (*sig_cache_exp).rel_value <
- PONG_SIGNATURE_LIFETIME.rel_value / 4)
- {
- /* create / update cached sig */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating PONG signature to indicate ownership.\n");
- *sig_cache_exp = GNUNET_TIME_relative_to_absolute (PONG_SIGNATURE_LIFETIME);
- pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_ecc_sign (GST_my_private_key, &pong->purpose,
- sig_cache));
- }
- else
- {
- pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
- }
- pong->signature = *sig_cache;
-
-#if KEEP_093_COMPATIBILITY
+ pong->expiration = GNUNET_TIME_absolute_hton (*sig_cache_exp);
}
-#endif
-
+ pong->signature = *sig_cache;
+
GNUNET_assert (sender_address != NULL);
/* first see if the session we got this PING from can be used to transmit
* a response reliably */
- papi = GST_plugins_find (sender_address->transport_name);
if (papi == NULL)
ret = -1;
else
size_t size;
struct GNUNET_HELLO_Message *hello;
struct GNUNET_HELLO_Address address;
+ int sig_res;
+ int do_verify;
if (ntohs (hdr->size) < sizeof (struct TransportPongMessage))
{
address.address_length = addrlen;
address.transport_name = tname;
ve = find_validation_entry (NULL, &address);
- if ((NULL == ve) || (ve->expecting_pong == GNUNET_NO))
+ if ((NULL == ve) || (GNUNET_NO == ve->expecting_pong))
{
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
GNUNET_break_op (0);
return;
}
-
- if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
- &pong->purpose, &pong->signature,
- &ve->public_key))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Invalid signature on address %s:%s from peer `%s'\n",
- tname, GST_plugins_a2s (ve->address),
- GNUNET_i2s (sender));
- return;
- }
-
if (GNUNET_TIME_absolute_get_remaining
(GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value == 0)
{
GNUNET_NO);
return;
}
+
+ sig_res = GNUNET_SYSERR;
+ do_verify = GNUNET_YES;
+ if (0 != GNUNET_TIME_absolute_get_remaining(ve->pong_sig_valid_until).rel_value)
+ {
+ /* 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_EccSignature)))
+ {
+ /* signatures are identical, we can skip verification */
+ sig_res = GNUNET_OK;
+ do_verify = GNUNET_NO;
+ }
+ else
+ {
+ sig_res = GNUNET_SYSERR;
+ /* signatures do not match, we have to verify */
+ }
+ }
+
+ if (GNUNET_YES == do_verify)
+ {
+ /* Do expensive verification */
+ sig_res = GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
+ &pong->purpose, &pong->signature,
+ &ve->public_key);
+ if (sig_res == GNUNET_SYSERR)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to verify: invalid signature on address %s:%s from peer `%s'\n",
+ tname, GST_plugins_a2s (ve->address),GNUNET_i2s (sender));
+ }
+
+ if (sig_res == GNUNET_SYSERR)
+ return;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Address validated for peer `%s' with plugin `%s': `%s'\n",
GNUNET_i2s (sender), tname, GST_plugins_a2s (ve->address));
/* validity achieved, remember it! */
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->latency = GNUNET_TIME_absolute_get_duration (ve->send_time);
{
- struct GNUNET_ATS_Information ats;
- ats.type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- ats.value = htonl ((uint32_t) ve->latency.rel_value);
- GNUNET_ATS_address_add (GST_ats, ve->address, NULL, &ats, 1);
+ 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);
+ ats[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats[1].value = htonl ((uint32_t) ve->network);
+ GNUNET_ATS_address_add (GST_ats, ve->address, NULL, ats, 2);
+ }
+ if (validations_running > 0)
+ {
+ validations_running --;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Validation finished, %u validation processes running\n",
+ validations_running);
}
+ else
+ GNUNET_break (0);
+
/* build HELLO to store in PEERINFO */
ve->copied = GNUNET_NO;
- hello = GNUNET_HELLO_create (&ve->public_key, &add_valid_peer_address, ve);
+ hello = GNUNET_HELLO_create (&ve->public_key, &add_valid_peer_address, ve, GNUNET_NO);
GNUNET_PEERINFO_add_peer (GST_peerinfo, hello, NULL, NULL);
GNUNET_free (hello);
}
(const struct GNUNET_HELLO_Message *) hello;
struct ValidateAddressContext vac;
struct GNUNET_HELLO_Message *h;
+ int friend;
- if ((GNUNET_OK != GNUNET_HELLO_get_id (hm, &vac.pid)) ||
+ friend = GNUNET_HELLO_is_friend_only (hm);
+ if (((GNUNET_YES != friend) && (GNUNET_NO != friend)) ||
+ (GNUNET_OK != GNUNET_HELLO_get_id (hm, &vac.pid)) ||
(GNUNET_OK != GNUNET_HELLO_get_key (hm, &vac.public_key)))
{
/* malformed HELLO */
memcmp (&GST_my_identity, &vac.pid, sizeof (struct GNUNET_PeerIdentity)))
return;
/* Add peer identity without addresses to peerinfo service */
- h = GNUNET_HELLO_create (&vac.public_key, NULL, NULL);
+ h = GNUNET_HELLO_create (&vac.public_key, NULL, NULL, friend);
GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
projects / oweals / gnunet.git / blobdiff