size_t msg_size = ntohs (message->size);
size_t size =
sizeof (struct InboundMessage) + msg_size +
- sizeof (struct GNUNET_ATS_Information) * ats_count;
+ sizeof (struct GNUNET_ATS_Information) * (ats_count + 1);
char buf[size];
struct GNUNET_ATS_Information *ap;
im = (struct InboundMessage *) buf;
im->header.size = htons (size);
im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
- im->ats_count = htonl (ats_count);
+ im->ats_count = htonl (ats_count + 1);
im->peer = *peer;
ap = (struct GNUNET_ATS_Information *) &im[1];
memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
- memcpy (&ap[ats_count], message, ntohs (message->size));
+ ap[ats_count].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+ ap[ats_count].value = htonl ((uint32_t) GST_neighbour_get_latency (peer).rel_value);
+ memcpy (&ap[ats_count + 1], message, ntohs (message->size));
GST_clients_broadcast (&im->header, GNUNET_YES);
if (is_disconnecting (n))
return;
change_state (n, S_DISCONNECT);
+ GST_validation_set_address_use (&n->id,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen,
+ GNUNET_NO);
if (n->plugin_name != NULL)
{
return GNUNET_NO;
}
}
-
+ if (n->state == S_CONNECTED)
+ GST_validation_set_address_use (&n->id,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen,
+ GNUNET_NO);
GNUNET_free_non_null (n->addr);
n->addr = GNUNET_malloc (address_len);
memcpy (n->addr, address, address_len);
n->timeout_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT,
&neighbour_timeout_task, n);
+ if (n->state == S_CONNECTED)
+ GST_validation_set_address_use (&n->id,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen,
+ GNUNET_YES);
+
if (n->state == S_DISCONNECT)
{
}
+/**
+ * Obtain current latency information for the given neighbour.
+ *
+ * @param peer
+ * @return observed latency of the address, FOREVER if the address was
+ * never successfully validated
+ */
+struct GNUNET_TIME_Relative
+GST_neighbour_get_latency (const struct GNUNET_PeerIdentity *peer)
+{
+ struct NeighbourMapEntry *n;
+
+ n = lookup_neighbour (peer);
+ if (NULL == n)
+ return GNUNET_TIME_UNIT_FOREVER_REL;
+ return GST_validation_get_address_latency (peer,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen);
+}
+
+
/**
* Create an entry in the neighbour map for the given peer
*
was_connected = is_connected (n);
if (!is_connected (n))
+ {
change_state (n, S_CONNECTED);
+ GST_validation_set_address_use (&n->id,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen,
+ GNUNET_YES);
+ }
GNUNET_ATS_address_in_use (GST_ats, &n->id, n->plugin_name, n->addr,
n->addrlen, n->addr, GNUNET_YES);
if (!was_connected)
{
+ GST_validation_set_address_use (&n->id,
+ n->plugin_name,
+ n->session,
+ n->addr,
+ n->addrlen,
+ GNUNET_YES);
neighbours_connected++;
GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# peers connected"), 1,
GNUNET_NO);
/* do blacklist check */
bcc =
GNUNET_malloc (sizeof (struct BlackListCheckContext) +
- sizeof (struct GNUNET_ATS_Information) * ats_count +
+ sizeof (struct GNUNET_ATS_Information) * (ats_count + 1) +
sender_address_len + strlen (plugin_name) + 1);
bcc->ts = GNUNET_TIME_absolute_ntoh (scm->timestamp);
- bcc->ats_count = ats_count;
+ bcc->ats_count = ats_count + 1;
bcc->sender_address_len = sender_address_len;
bcc->session = session;
bcc->ats = (struct GNUNET_ATS_Information *) &bcc[1];
memcpy (bcc->ats, ats, sizeof (struct GNUNET_ATS_Information) * ats_count);
-
- bcc->sender_address = (char *) &bcc->ats[ats_count];
+ bcc->ats[ats_count].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
+ bcc->ats[ats_count].value = htonl ((uint32_t) GST_neighbour_get_latency (peer).rel_value);
+ bcc->sender_address = (char *) &bcc->ats[ats_count + 1];
memcpy (bcc->sender_address, sender_address, sender_address_len);
bcc->plugin_name = &bcc->sender_address[sender_address_len];
const struct GNUNET_ATS_Information *ats,
uint32_t ats_count);
+
+/**
+ * Obtain current latency information for the given neighbour.
+ *
+ * @param peer
+ * @return observed latency of the address, FOREVER if the address was
+ * never successfully validated
+ */
+struct GNUNET_TIME_Relative
+GST_neighbour_get_latency (const struct GNUNET_PeerIdentity *peer);
+
+
/**
* We received a disconnect message from the given peer,
* validate and process.
ve->revalidation_task = GNUNET_SCHEDULER_NO_TASK;
delay = GNUNET_TIME_absolute_get_remaining (ve->revalidation_block);
- if (delay.rel_value > 0)
- {
- /* should wait a bit longer */
- ve->revalidation_task =
- GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve);
- return;
- }
/* How long until we can possibly permit the next PING? */
canonical_delay =
(ve->in_use == GNUNET_YES)
: ( (GNUNET_TIME_absolute_get_remaining (ve->valid_until).rel_value > 0)
? VALIDATED_PING_FREQUENCY
: UNVALIDATED_PING_KEEPALIVE);
+ if (delay.rel_value > canonical_delay.rel_value * 2)
+ {
+ /* situation changed, recalculate delay */
+ delay = canonical_delay;
+ ve->revalidation_block = GNUNET_TIME_relative_to_absolute (delay);
+ }
+ if (delay.rel_value > 0)
+ {
+ /* should wait a bit longer */
+ ve->revalidation_task =
+ GNUNET_SCHEDULER_add_delayed (delay, &revalidate_address, ve);
+ return;
+ }
ve->revalidation_block =
GNUNET_TIME_relative_to_absolute (canonical_delay);
* Based on this, the validation module will measure latency for the
* address more or less often.
*
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param plugin_name name of plugin that received the PING
- * @param session session we got the PING from
+ * @param sender peer
+ * @param plugin_name name of plugin
+ * @param session session
* @param sender_address address of the sender as known to the plugin, NULL
* if we did not initiate the connection
* @param sender_address_len number of bytes in sender_address
*/
void
GST_validation_set_address_use (const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *hdr,
const char *plugin_name, struct Session *session,
const void *sender_address,
size_t sender_address_len,
int in_use)
{
- // FIXME: lookup address, update flag, re-schedule validation task
+ struct ValidationEntry *ve;
+
+ ve = find_validation_entry (NULL, sender, plugin_name, sender_address, sender_address_len);
+ if (NULL == ve)
+ {
+ /* FIXME: this can happen for inbound connections (sender_address_len == 0);
+ in that case, we should hack up some more code here to measure
+ latency for inbound connections! Also, in this case we'll need the session...
+ */
+ GNUNET_break (0);
+ return;
+ }
+ GNUNET_break (ve->in_use != in_use); /* should be different... */
+ ve->in_use = in_use;
+ if (in_use == GNUNET_YES)
+ {
+ /* from now on, higher frequeny, so reschedule now */
+ GNUNET_SCHEDULER_cancel (ve->revalidation_task);
+ ve->revalidation_task =
+ GNUNET_SCHEDULER_add_now (&revalidate_address, ve);
+ }
}
* Query validation about the latest observed latency on a given
* address.
*
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param plugin_name name of plugin that received the PING
- * @param session session we got the PING from
+ * @param sender peer
+ * @param plugin_name name of plugin
+ * @param session session
* @param sender_address address of the sender as known to the plugin, NULL
* if we did not initiate the connection
* @param sender_address_len number of bytes in sender_address
*/
struct GNUNET_TIME_Relative
GST_validation_get_address_latency (const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *hdr,
const char *plugin_name, struct Session *session,
const void *sender_address,
size_t sender_address_len)
{
- // FIXME: lookup address, return latency field...
- return GNUNET_TIME_UNIT_ZERO;
+ struct ValidationEntry *ve;
+
+ ve = find_validation_entry (NULL, sender, plugin_name, sender_address, sender_address_len);
+ if (NULL == ve)
+ return GNUNET_TIME_UNIT_FOREVER_REL;
+ return ve->latency;
}
* Based on this, the validation module will measure latency for the
* address more or less often.
*
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param plugin_name name of plugin that received the PING
- * @param session session we got the PING from
+ * @param sender peer
+ * @param plugin_name name of plugin
+ * @param session session
* @param sender_address address of the sender as known to the plugin, NULL
* if we did not initiate the connection
* @param sender_address_len number of bytes in sender_address
*/
void
GST_validation_set_address_use (const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *hdr,
const char *plugin_name, struct Session *session,
const void *sender_address,
size_t sender_address_len,
* Query validation about the latest observed latency on a given
* address.
*
- * @param sender peer sending the PING
- * @param hdr the PING
- * @param plugin_name name of plugin that received the PING
- * @param session session we got the PING from
+ * @param sender peer
+ * @param plugin_name name of plugin
+ * @param session session
* @param sender_address address of the sender as known to the plugin, NULL
* if we did not initiate the connection
* @param sender_address_len number of bytes in sender_address
*/
struct GNUNET_TIME_Relative
GST_validation_get_address_latency (const struct GNUNET_PeerIdentity *sender,
- const struct GNUNET_MessageHeader *hdr,
const char *plugin_name, struct Session *session,
const void *sender_address,
size_t sender_address_len);
projects / oweals / gnunet.git / commitdiff