*/
struct GNUNET_TIME_Absolute send_time;
+ /**
+ * At what time do we send the next validation request (PING)?
+ */
+ struct GNUNET_TIME_Absolute next_validation;
+
/**
* Until when is this address valid?
* ZERO if it is not currently considered valid.
*/
struct GNUNET_TIME_Relative latency;
+ /**
+ * Current state of this validation entry
+ */
+ enum GNUNET_TRANSPORT_ValidationState state;
/**
* Challenge number we used.
*/
*/
static struct GNUNET_TIME_Absolute validation_next;
+static GST_ValidationChangedCallback validation_entry_changed_cb;
+static void *validation_entry_changed_cb_cls;
+
/**
* Context for the validation entry match function.
*/
return GNUNET_YES;
}
+static void
+validation_entry_changed (struct ValidationEntry *ve, enum GNUNET_TRANSPORT_ValidationState state)
+{
+ char *t_sent = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string(ve->send_time));
+ char *t_valid = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string(ve->valid_until));
+ char *t_next = GNUNET_strdup(GNUNET_STRINGS_absolute_time_to_string(ve->next_validation));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Validation entry changed for peer `%s' address `%s':\n\tSent: %s\n\tValid: %s\n\tNext: %s\n",
+ GNUNET_i2s(&ve->pid), GST_plugins_a2s(ve->address),
+ t_sent, t_valid, t_next);
+ ve->state = state;
+
+ GNUNET_free (t_sent);
+ GNUNET_free (t_valid);
+ GNUNET_free (t_next);
+ validation_entry_changed_cb (validation_entry_changed_cb_cls, &ve->pid,
+ ve->address, ve->send_time, ve->valid_until, ve->next_validation, state);
+}
+
/**
* Iterate over validation entries and free them.
{
struct ValidationEntry *ve = value;
+ ve->next_validation = GNUNET_TIME_absolute_get_zero_();
+ ve->valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
+
+ /* Notify about deleted entry */
+ validation_entry_changed (ve, GNUNET_TRANSPORT_VS_REMOVE);
+
if (NULL != ve->bc)
{
GST_blacklist_test_cancel (ve->bc);
if (GNUNET_NO == result)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Blacklist denies to send PING to `%s' %s %s\n",
+ "Blacklist denies to send PING to `%s' `%s' `%s'\n",
GNUNET_i2s (pid),
GST_plugins_a2s (ve->address),
ve->address->transport_name);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Transmitting plain PING to `%s' %s %s\n",
+ "Transmitting plain PING to `%s' `%s' `%s'\n",
GNUNET_i2s (pid),
GST_plugins_a2s (ve->address),
ve->address->transport_name);
message_buf, tsize,
PING_PRIORITY, ACCEPTABLE_PING_DELAY,
NULL, NULL);
- network = papi->get_network (ve->address, session);
+ network = papi->get_network (papi->cls, session);
if (GNUNET_ATS_NET_UNSPECIFIED == network)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Could not obtain a valid network for `%s' %s\n",
+ "Could not obtain a valid network for `%s' `%s'\n",
GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
GNUNET_break(0);
}
else
{
/* Could not get a valid session */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not get a valid session for `%s' %s\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not get a valid session for `%s' `%s'\n",
GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
ret = -1;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Validation started, %u validation processes running\n",
validations_running);
+ /* Notify about PING sent */
+ validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
}
}
{
/* 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 validating address `%s'\n",
GNUNET_STRINGS_relative_time_to_string (delay,
GNUNET_YES),
GST_plugins_a2s (ve->address));
ve->revalidation_task =
GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve);
+ ve->next_validation = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), delay);
return;
}
blocked_for = GNUNET_TIME_absolute_get_remaining(validation_next);
{
/* Validations are blocked, have to wait for blocked_for time */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Validations blocked for another %s, delaying validating address %s\n",
+ "Validations blocked for another %s, delaying validating address `%s'\n",
GNUNET_STRINGS_relative_time_to_string (blocked_for,
GNUNET_YES),
GST_plugins_a2s (ve->address));
ve->revalidation_task =
GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve);
+ ve->next_validation = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), blocked_for);
return;
}
ve->revalidation_block = GNUNET_TIME_relative_to_absolute (canonical_delay);
}
/* End debug code for mantis 0002726*/
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Validating now, next scheduled for %s, now validating address %s\n",
+ "Validating now, next scheduled for %s, now validating address `%s'\n",
GNUNET_STRINGS_relative_time_to_string (blocked_for,
GNUNET_YES),
GST_plugins_a2s (ve->address));
ve->revalidation_task =
GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve);
+ ve->next_validation = GNUNET_TIME_absolute_add(GNUNET_TIME_absolute_get(), delay);
/* start PINGing by checking blacklist */
GNUNET_STATISTICS_update (GST_stats,
GNUNET_CONTAINER_multipeermap_put (validation_map, &address->peer,
ve,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ validation_entry_changed (ve, GNUNET_TRANSPORT_VS_NEW);
ve->expecting_pong = GNUNET_NO;
return ve;
}
if (GNUNET_SCHEDULER_NO_TASK == ve->revalidation_task)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting revalidations for valid address %s\n",
+ "Starting revalidations for valid address `%s'\n",
GST_plugins_a2s (ve->address));
+ 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);
if (NULL == hello)
return;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Handling HELLO for peer %s\n",
+ "Handling HELLO for peer `%s'\n",
GNUNET_i2s (peer));
GNUNET_assert (NULL ==
GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO,
/**
* Start the validation subsystem.
*
+ * @param cb callback to call with changes to valdidation entries
+ * @param cb_cls cls for the callback
* @param max_fds maximum number of fds to use
*/
void
-GST_validation_start (unsigned int max_fds)
+GST_validation_start (GST_ValidationChangedCallback cb, void *cb_cls, unsigned int max_fds)
{
/**
* Initialization for validation throttling
validation_delay.rel_value_us = (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT.rel_value_us) / (max_fds / 2);
validations_fast_start_threshold = (max_fds / 2);
validations_running = 0;
+ validation_entry_changed_cb = cb;
+ validation_entry_changed_cb_cls = cb_cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Validation uses a fast start threshold of %u connections and a delay between of %s\n ",
validations_fast_start_threshold,
GNUNET_STRINGS_relative_time_to_string (validation_delay,
addrend++;
slen = strlen (addr) + 1;
alen -= slen;
+ address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
address.address = addrend;
address.address_length = alen;
address.transport_name = addr;
if (NULL == (papi = GST_plugins_find (plugin_name)))
{
/* we don't have the plugin for this address */
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Plugin `%s' not available, cannot confirm having this address\n"),
plugin_name);
GNUNET_free (plugin_name);
gettext_noop
("# failed address checks during validation"), 1,
GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Address `%s' is not one of my addresses, not confirming PING\n"),
GST_plugins_a2s (&address));
return GNUNET_SYSERR;
gettext_noop
("# successful address checks during validation"), 1,
GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Address `%s' is one of my addresses, confirming PING\n",
GST_plugins_a2s (&address));
}
{
if (GNUNET_NO == buggy)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n"),
GNUNET_i2s (sender),
GST_plugins_a2s (&address));
ve = find_validation_entry (&vac->public_key, address);
if (GNUNET_SCHEDULER_NO_TASK == ve->revalidation_task)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting validation for fresh address %s\n",
+ 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);
}
* @param cls the 'struct ValidationEntry' with the validated address
* @param max space in buf
* @param buf where to add the address
- * @return number of bytes written, 0 to signal the
+ * @return number of bytes written, GNUNET_SYSERR to signal the
* end of the iteration.
*/
-static size_t
+static ssize_t
add_valid_peer_address (void *cls, size_t max, void *buf)
{
struct ValidationEntry *ve = cls;
if (GNUNET_YES == ve->copied)
- return 0; /* terminate */
+ return GNUNET_SYSERR; /* Done */
ve->copied = GNUNET_YES;
return GNUNET_HELLO_add_address (ve->address, ve->valid_until, buf, max);
}
address.address = addr;
address.address_length = addrlen;
address.transport_name = tname;
+ address.local_info = GNUNET_HELLO_ADDRESS_INFO_NONE;
ve = find_validation_entry (NULL, &address);
if ((NULL == ve) || (GNUNET_NO == ve->expecting_pong))
{
{
GNUNET_break_op (0);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Failed to verify: invalid signature on address %s:%s from peer `%s'\n",
+ "Failed to verify: invalid signature on address `%s':%s from peer `%s'\n",
tname,
GST_plugins_a2s (ve->address),
GNUNET_i2s (sender));
return GNUNET_SYSERR;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Address validated for peer `%s' with plugin `%s': `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Validation process successful for peer `%s' with plugin `%s' address `%s'\n",
GNUNET_i2s (sender), tname, GST_plugins_a2s (ve->address));
/* validity achieved, remember it! */
ve->expecting_pong = GNUNET_NO;
GNUNET_break (0);
}
+ /* Notify about new validity */
+ validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
+
/* build HELLO to store in PEERINFO */
ve->copied = GNUNET_NO;
hello = GNUNET_HELLO_create (&ve->public_key,
return GNUNET_OK;
/* Add peer identity without addresses to peerinfo service */
h = GNUNET_HELLO_create (&vac.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 (&vac.pid),
+ ntohs (hello->size));
GNUNET_PEERINFO_add_peer (GST_peerinfo, h, NULL, NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
return ve->latency;
}
+/**
+ * Closure for the validation_entries_iterate function.
+ */
+struct ValidationIteratorContext
+{
+ /**
+ * Function to call on each validation entry
+ */
+ GST_ValidationChangedCallback cb;
+
+ /**
+ * Closure for 'cb'.
+ */
+ void *cb_cls;
+};
+
+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->pid), GST_plugins_a2s (ve->address));
+ ic->cb (ic->cb_cls, &ve->pid, 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 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