/*
This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ (C) 2010-2014 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
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet-service-transport_clients.h"
#include "gnunet-service-transport_validation.h"
#include "gnunet-service-transport_plugins.h"
#include "gnunet-service-transport_hello.h"
*/
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.
*/
*/
int expecting_pong;
- /* FIXME: DEBUGGING */
- int last_line_set_to_no;
- int last_line_set_to_yes;
-
enum GNUNET_ATS_Network_Type network;
};
*/
static struct GNUNET_PEERINFO_NotifyContext *pnc;
-
/**
* Minimum delay between to validations
*/
*/
static struct GNUNET_TIME_Absolute validation_next;
+
/**
* Context for the validation entry match function.
*/
/**
* Iterate over validation entries until a matching one is found.
*
- * @param cls the 'struct ValidationEntryMatchContext'
+ * @param cls the `struct ValidationEntryMatchContext *`
* @param key peer identity (unused)
- * @param value a 'struct ValidationEntry' to match
- * @return GNUNET_YES if the entry does not match,
- * GNUNET_NO if the entry does match
+ * @param value a `struct ValidationEntry *` to match
+ * @return #GNUNET_YES if the entry does not match,
+ * #GNUNET_NO if the entry does match
*/
static int
-validation_entry_match (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
+validation_entry_match (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct ValidationEntryMatchContext *vemc = cls;
struct ValidationEntry *ve = value;
}
+/**
+ * A validation entry changed. Update the state and notify
+ * monitors.
+ *
+ * @param ve validation entry that changed
+ * @param state new state
+ */
+static void
+validation_entry_changed (struct ValidationEntry *ve,
+ enum GNUNET_TRANSPORT_ValidationState state)
+{
+ ve->state = state;
+ GST_clients_broadcast_validation_notification (&ve->pid,
+ ve->address,
+ ve->send_time,
+ ve->valid_until,
+ ve->next_validation,
+ state);
+}
+
+
/**
* Iterate over validation entries and free them.
*
* @param cls (unused)
* @param key peer identity (unused)
- * @param value a 'struct ValidationEntry' to clean up
- * @return GNUNET_YES (continue to iterate)
+ * @param value a `struct ValidationEntry *` to clean up
+ * @return #GNUNET_YES (continue to iterate)
*/
static int
-cleanup_validation_entry (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
+cleanup_validation_entry (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
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);
ret = -1;
else
{
- GNUNET_assert (papi->send != NULL);
- GNUNET_assert (papi->get_session != NULL);
+ GNUNET_assert (NULL != papi->send);
+ GNUNET_assert (NULL != papi->get_session);
struct Session * session = papi->get_session(papi->cls, ve->address);
if (session != NULL)
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",
- GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+ 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 (pid, ve->address, session, tsize);
else
{
/* Could not get a valid session */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not get a valid session for `%s' %s\n",
- GNUNET_i2s (pid), GST_plugins_a2s (ve->address));
+ 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;
}
}
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);
+ validations_running++;
+ 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,
return ve;
if (public_key == NULL)
return NULL;
- ve = GNUNET_malloc (sizeof (struct ValidationEntry));
+ ve = GNUNET_new (struct ValidationEntry);
ve->in_use = GNUNET_SYSERR; /* not defined */
- ve->last_line_set_to_no = 0;
- ve->last_line_set_to_yes = 0;
ve->address = GNUNET_HELLO_address_copy (address);
ve->public_key = *public_key;
ve->pid = address->peer;
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,
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;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Validation uses a fast start threshold of %u connections and a delay between of %s\n ",
+ 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,
GNUNET_YES));
{
struct TransportPongMessage *pong = cls;
struct GNUNET_TRANSPORT_PluginFunctions *papi;
+ struct Session *session;
papi = GST_plugins_find (address->transport_name);
- if (papi == NULL)
+ if (NULL == papi)
return;
- GNUNET_assert (papi->send != NULL);
- GNUNET_assert (papi->get_session != NULL);
-
- struct Session * session = papi->get_session(papi->cls, address);
- if (session == NULL)
+ GNUNET_assert (NULL != papi->send);
+ GNUNET_assert (NULL != papi->get_session);
+ session = papi->get_session(papi->cls, address);
+ if (NULL == session)
{
GNUNET_break (0);
return;
}
-
papi->send (papi->cls, session,
- (const char *) pong, ntohs (pong->header.size),
- PONG_PRIORITY, ACCEPTABLE_PING_DELAY,
+ (const char *) pong,
+ ntohs (pong->header.size),
+ PONG_PRIORITY,
+ ACCEPTABLE_PING_DELAY,
NULL, NULL);
GST_neighbours_notify_data_sent (&address->peer,
- address, session, pong->header.size);
+ address,
+ session,
+ pong->header.size);
}
* @param hdr the PING
* @param sender_address the sender address as we got it
* @param session session we got the PING from
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_validation_handle_ping (const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *hdr,
const struct GNUNET_HELLO_Address *sender_address,
if (ntohs (hdr->size) < sizeof (struct TransportPingMessage))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
ping = (const struct TransportPingMessage *) hdr;
if (0 !=
gettext_noop
("# PING message for different peer received"), 1,
GNUNET_NO);
- return;
+ return GNUNET_SYSERR;
}
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# PING messages received"), 1,
if (NULL == addrend)
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
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 == address.transport_name)
{
- GNUNET_break (0);
+ 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");
- }
+ {
+ 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);
+ 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_log (GNUNET_ERROR_TYPE_INFO,
+ _("Plugin `%s' not available, cannot confirm having this address\n"),
+ plugin_name);
GNUNET_free (plugin_name);
- return;
+ return GNUNET_SYSERR;
}
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;
- }
+ 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;
+ }
else
{
GNUNET_STATISTICS_update (GST_stats,
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,
- "Not confirming PING from peer `%s' with address `%s' since I cannot confirm having this address.\n",
+ 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));
- return;
+ return GNUNET_SYSERR;
}
else
{
NULL, NULL);
if (-1 != ret)
GST_neighbours_notify_data_sent (sender,
- sender_address, session, pong->header.size);
-
+ sender_address, session,
+ pong->header.size);
}
}
- if (ret != -1)
+ if (-1 != ret)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitted PONG to `%s' via reliable mechanism\n",
("# PONGs unicast via reliable transport"), 1,
GNUNET_NO);
GNUNET_free (pong);
- return;
+ return GNUNET_OK;
}
/* no reliable method found, try transmission via all known addresses */
gettext_noop
("# PONGs multicast to all available addresses"), 1,
GNUNET_NO);
- GST_validation_get_addresses (sender, &multicast_pong, pong);
+ GST_validation_get_addresses (sender,
+ &multicast_pong, pong);
GNUNET_free (pong);
+ return GNUNET_OK;
}
/**
- * Context for the 'validate_address' function
+ * Context for the #validate_address_iterator() function
*/
struct ValidateAddressContext
{
* Public key of the peer whose address is being validated.
*/
struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+
};
* Iterator callback to go over all addresses and try to validate them
* (unless blocked or already validated).
*
- * @param cls pointer to a 'struct ValidateAddressContext'
+ * @param cls pointer to a `struct ValidateAddressContext *`
* @param address the address
* @param expiration expiration time
* @return #GNUNET_OK (keep the 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",
- GST_plugins_a2s (ve->address));
+ 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);
}
return GNUNET_OK;
/**
* Add the validated peer address to the HELLO.
*
- * @param cls the 'struct ValidationEntry' with the validated address
- * @param max space in buf
+ * @param cls the `struct ValidationEntry *` with the validated address
+ * @param max space in @a 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
-add_valid_peer_address (void *cls, size_t max, void *buf)
+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);
}
*
* @param sender peer sending the PONG
* @param hdr the PONG
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_validation_handle_pong (const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_MessageHeader *hdr)
{
if (ntohs (hdr->size) < sizeof (struct TransportPongMessage))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# PONG messages received"), 1,
if (NULL == addr)
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
addr++;
slen = strlen (tname) + 1;
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))
{
gettext_noop
("# PONGs dropped, no matching pending validation"),
1, GNUNET_NO);
- return;
+ return GNUNET_OK;
}
/* now check that PONG is well-formed */
if (0 != memcmp (&ve->pid, sender, sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
- return;
+ return GNUNET_SYSERR;
}
if (GNUNET_TIME_absolute_get_remaining
(GNUNET_TIME_absolute_ntoh (pong->expiration)).rel_value_us == 0)
gettext_noop
("# PONGs dropped, signature expired"), 1,
GNUNET_NO);
- return;
+ return GNUNET_SYSERR;
}
sig_res = GNUNET_SYSERR;
do_verify = GNUNET_YES;
- if (0 != GNUNET_TIME_absolute_get_remaining(ve->pong_sig_valid_until).rel_value_us)
+ if (0 != GNUNET_TIME_absolute_get_remaining (ve->pong_sig_valid_until).rel_value_us)
{
/* We have a cached and valid signature for this peer,
* try to compare instead of verify */
&pong->purpose, &pong->signature,
&ve->public_key);
if (sig_res == GNUNET_SYSERR)
+ {
+ GNUNET_break_op (0);
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));
+ "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_break_op (0);
+ return GNUNET_SYSERR;
+ }
- 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));
+ 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;
ve->valid_until = GNUNET_TIME_relative_to_absolute (HELLO_ADDRESS_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);
validations_running);
}
else
- GNUNET_break (0);
+ {
+ 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;
GNUNET_NO);
GNUNET_PEERINFO_add_peer (GST_peerinfo, hello, NULL, NULL);
GNUNET_free (hello);
+ return GNUNET_OK;
}
* validation.
*
* @param hello the HELLO we received
+ * @return #GNUNET_OK if the message was fine, #GNUNET_SYSERR on serious error
*/
-void
+int
GST_validation_handle_hello (const struct GNUNET_MessageHeader *hello)
{
const struct GNUNET_HELLO_Message *hm =
int friend;
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)))
+ 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 */
- GNUNET_break (0);
- return;
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
}
if (0 ==
memcmp (&GST_my_identity, &vac.pid, sizeof (struct GNUNET_PeerIdentity)))
- return;
+ 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,
GNUNET_HELLO_iterate_addresses (hm, GNUNET_NO,
&validate_address_iterator,
&vac));
+ return GNUNET_OK;
}
/**
- * Closure for 'iterate_addresses'
+ * Closure for #iterate_addresses().
*/
struct IteratorContext
{
GST_ValidationAddressCallback cb;
/**
- * Closure for 'cb'.
+ * Closure for @e cb.
*/
void *cb_cls;
/**
* Call the callback in the closure for each validation entry.
*
- * @param cls the 'struct GST_ValidationIteratorContext'
+ * @param cls the `struct IteratorContext`
* @param key the peer's identity
- * @param value the 'struct ValidationEntry'
+ * @param value the `struct ValidationEntry`
* @return #GNUNET_OK (continue to iterate)
*/
static int
-iterate_addresses (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
+iterate_addresses (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
struct IteratorContext *ic = cls;
struct ValidationEntry *ve = value;
*
* @param target peer information is requested for
* @param cb function to call; will not be called after this function returns
- * @param cb_cls closure for 'cb'
+ * @param cb_cls closure for @a cb
*/
void
GST_validation_get_addresses (const struct GNUNET_PeerIdentity *target,
* @param session the session
* @param in_use #GNUNET_YES if we are now using the address for a connection,
* #GNUNET_NO if we are no longer using the address for a connection
- * @param line line of caller just for DEBUGGING!
*/
void
GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
struct Session *session,
- int in_use,
- int line)
+ int in_use)
{
struct ValidationEntry *ve;
if (GNUNET_YES == in_use)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error setting address in use for peer `%s' `%s' to USED: set last time by %i, called now by %i\n",
- GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
- ve->last_line_set_to_yes, line);
+ "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: set last time by %i, called now by %i\n",
- GNUNET_i2s (&address->peer), GST_plugins_a2s (address),
- ve->last_line_set_to_no, line);
+ "Error setting address in use for peer `%s' `%s' to NOT_USED\n",
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
}
}
- if (GNUNET_YES == in_use)
- {
- ve->last_line_set_to_yes = line;
- }
- if (GNUNET_NO == in_use)
- {
- ve->last_line_set_to_no = line;
- }
-
GNUNET_break (ve->in_use != in_use); /* should be different... */
ve->in_use = in_use;
if (in_use == GNUNET_YES)
return ve->latency;
}
+/**
+ * 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;
+};
+
+
+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