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.
*/
/**
ve->valid_until = GNUNET_TIME_UNIT_ZERO_ABS;
/* Notify about deleted entry */
- validation_entry_changed (ve, GNUNET_TRANSPORT_VS_REMOVE);
+ validation_entry_changed (ve,
+ GNUNET_TRANSPORT_VS_REMOVE);
if (NULL != ve->bc)
{
gettext_noop ("# validations running"),
validations_running,
GNUNET_NO);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Validation aborted, %u validation processes running\n",
- validations_running);
}
GNUNET_free (ve);
return GNUNET_OK;
struct GNUNET_TIME_Relative left;
ve->timeout_task = NULL;
+ /* For valid addresses, we want to wait until the expire;
+ for addresses under PING validation, we want to wait
+ until we give up on the PING */
max = GNUNET_TIME_absolute_max (ve->valid_until,
ve->revalidation_block);
left = GNUNET_TIME_absolute_get_remaining (max);
if (left.rel_value_us > 0)
{
- /* should wait a bit longer */
+ /* We should wait a bit longer. This happens when
+ address lifetimes are extended due to successful
+ validations. */
ve->timeout_task =
- GNUNET_SCHEDULER_add_delayed (left, &timeout_hello_validation, ve);
+ GNUNET_SCHEDULER_add_delayed (left,
+ &timeout_hello_validation,
+ ve);
return;
}
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# address records discarded"), 1,
+ gettext_noop ("# address records discarded (timeout)"),
+ 1,
GNUNET_NO);
- cleanup_validation_entry (NULL, &ve->address->peer, ve);
+ cleanup_validation_entry (NULL,
+ &ve->address->peer,
+ ve);
}
*
* @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;
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 to send PING to `%s' `%s' `%s'\n",
+ "Blacklist denies sending PING to `%s' `%s' `%s'\n",
GNUNET_i2s (pid),
GST_plugins_a2s (ve->address),
ve->address->transport_name);
- cleanup_validation_entry (NULL, pid, ve);
+ GNUNET_STATISTICS_update (GST_stats,
+ gettext_noop ("# address records discarded (blacklist)"),
+ 1,
+ GNUNET_NO);
+ cleanup_validation_entry (NULL,
+ pid,
+ ve);
return;
}
hello = GST_hello_get ();
- if (NULL == hello)
- {
- GNUNET_break (0);
- return;
- }
- 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);
-
+ GNUNET_assert (NULL != hello);
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) +
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));
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);
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,
validations_running,
GNUNET_NO);
/* Notify about PING sent */
- validation_entry_changed (ve, GNUNET_TRANSPORT_VS_UPDATE);
+ 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 (re)validating address `%s'\n",
GNUNET_STRINGS_relative_time_to_string (delay,
GNUNET_YES),
GST_plugins_a2s (ve->address));
1,
GNUNET_NO);
ve->revalidation_task =
- GNUNET_SCHEDULER_add_delayed (blocked_for, &revalidate_address, ve);
+ GNUNET_SCHEDULER_add_delayed (blocked_for,
+ &revalidate_address,
+ ve);
ve->next_validation = GNUNET_TIME_relative_to_absolute (blocked_for);
return;
}
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",
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 */
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... */
GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX);
ve->timeout_task =
GNUNET_SCHEDULER_add_delayed (UNVALIDATED_PING_KEEPALIVE,
- &timeout_hello_validation, ve);
- GNUNET_CONTAINER_multipeermap_put (validation_map, &address->peer,
+ &timeout_hello_validation,
+ ve);
+ GNUNET_CONTAINER_multipeermap_put (validation_map,
+ &address->peer,
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;
}
const struct GNUNET_HELLO_Message *hello = cls;
struct ValidationEntry *ve;
struct GNUNET_PeerIdentity pid;
- struct GNUNET_ATS_Information ats;
+ struct GNUNET_ATS_Properties prop;
if (0 == GNUNET_TIME_absolute_get_remaining (expiration).rel_value_us)
return GNUNET_OK; /* expired */
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);
+ 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);
if (GNUNET_YES != ve->known_to_ats)
{
ve->known_to_ats = GNUNET_YES;
- GST_ats_add_address (address, &ats, 1);
+ GST_ats_add_address (address, &prop);
}
return GNUNET_OK;
}
{
/* 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);
{
- 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);
- ats[1].value = htonl ((uint32_t) ve->network);
if (GNUNET_YES == ve->known_to_ats)
{
- GST_ats_update_metrics (ve->address, NULL, ats, 2);
+ GST_ats_update_delay (ve->address,
+ GNUNET_TIME_relative_divide (ve->latency, 2));
}
else
{
+ struct GNUNET_ATS_Properties prop;
+
+ memset (&prop, 0, sizeof (prop));
+ prop.scope = ve->network;
+ prop.delay = GNUNET_TIME_relative_divide (ve->latency, 2);
ve->known_to_ats = GNUNET_YES;
- GST_ats_add_address (ve->address, ats, 2);
+ GST_ats_add_address (ve->address, &prop);
}
}
if (validations_running > 0)
}
/* 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;
}
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,
projects / oweals / gnunet.git / blobdiff