* @author Christian Grothoff
*
* TODO:
+ * - collect traffic data for anonymity levels > 1
+ * - implement transmission restrictions for anonymity level > 1
* - more statistics
*/
#include "platform.h"
#include "gnunet_protocols.h"
#include "gnunet_signatures.h"
#include "gnunet_statistics_service.h"
+#include "gnunet_transport_service.h"
#include "gnunet_util_lib.h"
#include "gnunet-service-fs_indexing.h"
#include "fs.h"
*/
#define TRUST_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+/**
+ * How quickly do we age cover traffic? At the given
+ * time interval, remaining cover traffic counters are
+ * decremented by 1/16th.
+ */
+#define COVER_AGE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+
/**
* How often do we at most PUT content into the DHT?
*/
*/
struct GNUNET_LOAD_Value *transmission_delay;
+ /**
+ * Context of our GNUNET_CORE_peer_change_preference call (or NULL).
+ */
+ struct GNUNET_CORE_InformationRequestContext *irc;
+
+ /**
+ * Request for which 'irc' is currently active (or NULL).
+ */
+ struct PendingRequest *pr;
+
/**
* Time when the last transmission request was issued.
*/
};
-
-
-
/**
* Doubly-linked list of messages we are performing
* due to a pending request.
struct GNUNET_CONTAINER_BloomFilter *bf;
/**
- * Context of our GNUNET_CORE_peer_change_preference call.
+ * Reference to DHT get operation for this request (or NULL).
*/
- struct GNUNET_CORE_InformationRequestContext *irc;
+ struct GNUNET_DHT_GetHandle *dht_get;
/**
- * Reference to DHT get operation for this request (or NULL).
+ * Context of our GNUNET_CORE_peer_change_preference call.
*/
- struct GNUNET_DHT_GetHandle *dht_get;
+ struct ConnectedPeer *pirc;
/**
* Hash code of all replies that we have seen so far (only valid
*/
static struct GNUNET_CONFIGURATION_Handle *block_cfg;
-/**
- * Our scheduler.
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our configuration.
*/
/**
* Are we allowed to migrate content to this peer.
*/
-static int active_migration;
+static int active_to_migration;
+
+/**
+ * Are we allowed to push out content from this peer.
+ */
+static int active_from_migration;
/**
* How many entires with zero anonymity do we currently estimate
*/
static struct GNUNET_LOAD_Value *rt_entry_lifetime;
+/**
+ * How many query messages have we received 'recently' that
+ * have not yet been claimed as cover traffic?
+ */
+static unsigned int cover_query_count;
+
+/**
+ * How many content messages have we received 'recently' that
+ * have not yet been claimed as cover traffic?
+ */
+static unsigned int cover_content_count;
+
+/**
+ * ID of our task that we use to age the cover counters.
+ */
+static GNUNET_SCHEDULER_TaskIdentifier cover_age_task;
+
+static void
+age_cover_counters (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ cover_content_count = (cover_content_count * 15) / 16;
+ cover_query_count = (cover_query_count * 15) / 16;
+ cover_age_task = GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY,
+ &age_cover_counters,
+ NULL);
+}
+
/**
* We've just now completed a datastore request. Update our
* datastore load calculations.
delay = GNUNET_TIME_absolute_get_duration (start);
GNUNET_LOAD_update (datastore_get_load,
- delay.value);
+ delay.rel_value);
}
unsigned int repl;
/* consider 'cp' as a migration target for mb */
- if (GNUNET_TIME_absolute_get_remaining (cp->migration_blocked).value > 0)
+ if (GNUNET_TIME_absolute_get_remaining (cp->migration_blocked).rel_value > 0)
return GNUNET_YES; /* peer has requested no migration! */
if (mb != NULL)
{
#endif
if (cp->delayed_transmission_request_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, cp->delayed_transmission_request_task);
+ GNUNET_SCHEDULER_cancel (cp->delayed_transmission_request_task);
cp->delayed_transmission_request_task = GNUNET_SCHEDULER_NO_TASK;
}
cp->cth
MAX_MIGRATION_QUEUE);
delay = GNUNET_TIME_relative_max (delay,
min_migration_delay);
- mig_task = GNUNET_SCHEDULER_add_delayed (sched,
- delay,
+ mig_task = GNUNET_SCHEDULER_add_delayed (delay,
&gather_migration_blocks,
NULL);
}
(hopefully) appear */
delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5);
}
- dht_task = GNUNET_SCHEDULER_add_delayed (sched,
- delay,
+ dht_task = GNUNET_SCHEDULER_add_delayed (delay,
&gather_dht_put_blocks,
cls);
}
#endif
GNUNET_DHT_put (dht_handle,
key,
+ DEFAULT_PUT_REPLICATION,
GNUNET_DHT_RO_NONE,
type,
size,
pr))
{
GNUNET_LOAD_update (rt_entry_lifetime,
- GNUNET_TIME_absolute_get_duration (pr->start_time).value);
+ GNUNET_TIME_absolute_get_duration (pr->start_time).rel_value);
}
if (pr->qe != NULL)
{
GNUNET_CONTAINER_bloomfilter_free (pr->bf);
pr->bf = NULL;
}
- if (pr->irc != NULL)
+ if (pr->pirc != NULL)
{
- GNUNET_CORE_peer_change_preference_cancel (pr->irc);
- pr->irc = NULL;
+ GNUNET_CORE_peer_change_preference_cancel (pr->pirc->irc);
+ pr->pirc->irc = NULL;
+ pr->pirc = NULL;
}
if (pr->replies_seen != NULL)
{
}
if (pr->task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched,
- pr->task);
+ GNUNET_SCHEDULER_cancel (pr->task);
pr->task = GNUNET_SCHEDULER_NO_TASK;
}
while (NULL != pr->pending_head)
}
+/**
+ * Find latency information in 'atsi'.
+ *
+ * @param atsi performance data
+ * @return connection latency
+ */
+static struct GNUNET_TIME_Relative
+get_latency (const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+{
+ while ( (ntohl (atsi->type) != GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR) &&
+ (ntohl (atsi->type) != GNUNET_TRANSPORT_ATS_QUALITY_NET_DELAY) )
+ atsi++;
+ if (ntohl (atsi->type) == GNUNET_TRANSPORT_ATS_ARRAY_TERMINATOR)
+ {
+ GNUNET_break (0);
+ /* how can we not have latency data? */
+ return GNUNET_TIME_UNIT_SECONDS;
+ }
+ return GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ ntohl (atsi->value));
+}
+
+
/**
* Method called whenever a given peer connects.
*
* @param cls closure, not used
* @param peer peer identity this notification is about
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance information
*/
static void
peer_connect_handler (void *cls,
const struct
GNUNET_PeerIdentity * peer,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct ConnectedPeer *cp;
struct MigrationReadyBlock *pos;
char *fn;
uint32_t trust;
+ struct GNUNET_TIME_Relative latency;
+ latency = get_latency (atsi);
cp = GNUNET_CONTAINER_multihashmap_get (connected_peers,
&peer->hashPubKey);
if (NULL != cp)
*
* @param cls closure
* @param peer peer identity this notification is about
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
* @param bandwidth_in available amount of inbound bandwidth
* @param bandwidth_out available amount of outbound bandwidth
* @param timeout absolute time when this peer will time out
* unless we see some further activity from it
+ * @param atsi status information
*/
static void
peer_status_handler (void *cls,
const struct
GNUNET_PeerIdentity * peer,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_TIME_Absolute timeout)
+ struct GNUNET_TIME_Absolute timeout,
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct ConnectedPeer *cp;
+ struct GNUNET_TIME_Relative latency;
+ latency = get_latency (atsi);
cp = GNUNET_CONTAINER_multihashmap_get (connected_peers,
&peer->hashPubKey);
- GNUNET_assert (cp != NULL);
+ if (cp == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
GNUNET_LOAD_value_set_decline (cp->transmission_delay,
latency);
}
static int
change_host_trust (struct ConnectedPeer *host, int value)
{
- unsigned int old_trust;
-
if (value == 0)
return 0;
GNUNET_assert (host != NULL);
- old_trust = host->trust;
if (value > 0)
{
if (host->trust + value < host->trust)
return;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- GNUNET_SCHEDULER_add_delayed (tc->sched,
- TRUST_FLUSH_FREQ, &cron_flush_trust, NULL);
+ GNUNET_SCHEDULER_add_delayed (TRUST_FLUSH_FREQ, &cron_flush_trust, NULL);
}
GNUNET_CONTAINER_multihashmap_remove (connected_peers,
&peer->hashPubKey,
cp));
+ if (cp->irc != NULL)
+ {
+ GNUNET_CORE_peer_change_preference_cancel (cp->irc);
+ cp->irc = NULL;
+ cp->pr->pirc = NULL;
+ cp->pr = NULL;
+ }
+
/* remove this peer from migration considerations; schedule
alternatives */
next = mig_head;
}
if (cp->delayed_transmission_request_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, cp->delayed_transmission_request_task);
+ GNUNET_SCHEDULER_cancel (cp->delayed_transmission_request_task);
cp->delayed_transmission_request_task = GNUNET_SCHEDULER_NO_TASK;
}
while (NULL != (pm = cp->pending_messages_head))
}
if (GNUNET_SCHEDULER_NO_TASK != mig_task)
{
- GNUNET_SCHEDULER_cancel (sched, mig_task);
+ GNUNET_SCHEDULER_cancel (mig_task);
mig_task = GNUNET_SCHEDULER_NO_TASK;
}
if (GNUNET_SCHEDULER_NO_TASK != dht_task)
{
- GNUNET_SCHEDULER_cancel (sched, dht_task);
+ GNUNET_SCHEDULER_cancel (dht_task);
dht_task = GNUNET_SCHEDULER_NO_TASK;
}
while (client_list != NULL)
block_ctx = NULL;
GNUNET_CONFIGURATION_destroy (block_cfg);
block_cfg = NULL;
- sched = NULL;
cfg = NULL;
GNUNET_free_non_null (trustDirectory);
trustDirectory = NULL;
+ GNUNET_SCHEDULER_cancel (cover_age_task);
+ cover_age_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Dropping message, core too busy.\n");
#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Dropping message, core too busy.\n");
GNUNET_LOAD_update (cp->transmission_delay,
UINT64_MAX);
+
+ if (NULL != (pm = cp->pending_messages_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (cp->pending_messages_head,
+ cp->pending_messages_tail,
+ pm);
+ cp->pending_requests--;
+ destroy_pending_message (pm, 0);
+ }
+ if (NULL != (pm = cp->pending_messages_head))
+ {
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == cp->delayed_transmission_request_task);
+ min_delay = GNUNET_TIME_absolute_get_remaining (pm->delay_until);
+ cp->delayed_transmission_request_task
+ = GNUNET_SCHEDULER_add_delayed (min_delay,
+ &delayed_transmission_request,
+ cp);
+ }
return 0;
}
GNUNET_LOAD_update (cp->transmission_delay,
- GNUNET_TIME_absolute_get_duration (cp->last_transmission_request_start).value);
+ GNUNET_TIME_absolute_get_duration (cp->last_transmission_request_start).rel_value);
now = GNUNET_TIME_absolute_get ();
msize = 0;
min_delay = GNUNET_TIME_UNIT_FOREVER_REL;
(pm->msize <= size) )
{
next_pm = pm->next;
- if (pm->delay_until.value > now.value)
+ if (pm->delay_until.abs_value > now.abs_value)
{
min_delay = GNUNET_TIME_relative_min (min_delay,
GNUNET_TIME_absolute_get_remaining (pm->delay_until));
{
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == cp->delayed_transmission_request_task);
cp->delayed_transmission_request_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- min_delay,
+ = GNUNET_SCHEDULER_add_delayed (min_delay,
&delayed_transmission_request,
cp);
}
}
if (cp->delayed_transmission_request_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched, cp->delayed_transmission_request_task);
+ GNUNET_SCHEDULER_cancel (cp->delayed_transmission_request_task);
cp->delayed_transmission_request_task = GNUNET_SCHEDULER_NO_TASK;
}
/* need to schedule transmission */
"Transmission of request failed, will try again later.\n");
#endif
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- get_processing_delay (),
+ pr->task = GNUNET_SCHEDULER_add_delayed (get_processing_delay (),
&forward_request_task,
pr);
return;
pr->used_targets[i].last_request_time = GNUNET_TIME_absolute_get ();
pr->used_targets[i].num_requests++;
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- get_processing_delay (),
+ pr->task = GNUNET_SCHEDULER_add_delayed (get_processing_delay (),
&forward_request_task,
pr);
}
*
* @param cls the requests "struct PendingRequest*"
* @param peer identifies the peer
- * @param bpm_in set to the current bandwidth limit (receiving) for this peer
* @param bpm_out set to the current bandwidth limit (sending) for this peer
* @param amount set to the amount that was actually reserved or unreserved
* @param preference current traffic preference for the given peer
target_reservation_cb (void *cls,
const struct
GNUNET_PeerIdentity * peer,
- struct GNUNET_BANDWIDTH_Value32NBO bpm_in,
struct GNUNET_BANDWIDTH_Value32NBO bpm_out,
int amount,
uint64_t preference)
uint32_t bm;
unsigned int i;
- pr->irc = NULL;
- if (peer == NULL)
- {
- /* error in communication with core, try again later */
- if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- get_processing_delay (),
- &forward_request_task,
- pr);
- return;
- }
/* (3) transmit, update ttl/priority */
cp = GNUNET_CONTAINER_multihashmap_get (connected_peers,
&peer->hashPubKey);
"Selected peer disconnected!\n");
#endif
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- get_processing_delay (),
+ pr->task = GNUNET_SCHEDULER_add_delayed (get_processing_delay (),
+ &forward_request_task,
+ pr);
+ return;
+ }
+ cp->irc = NULL;
+ pr->pirc = NULL;
+ if (peer == NULL)
+ {
+ /* error in communication with core, try again later */
+ if (pr->task == GNUNET_SCHEDULER_NO_TASK)
+ pr->task = GNUNET_SCHEDULER_add_delayed (get_processing_delay (),
&forward_request_task,
pr);
return;
1,
GNUNET_NO);
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- get_processing_delay (),
+ pr->task = GNUNET_SCHEDULER_add_delayed (get_processing_delay (),
&forward_request_task,
pr);
return; /* this target round failed */
*/
double target_score;
+ /**
+ * Does it make sense to we re-try quickly again?
+ */
+ int fast_retry;
+
};
unsigned int pc;
/* 1) check that this peer is not the initiator */
- if (cp == pr->cp)
+ if (cp == pr->cp)
{
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
#endif
return GNUNET_YES; /* skip */
}
+ if (cp->irc != NULL)
+ {
+ psc->fast_retry = GNUNET_YES;
+ return GNUNET_YES; /* skip: already querying core about this peer for other reasons */
+ }
/* 2) check if we have already (recently) forwarded to this peer */
/* 2a) this particular request */
{
pc = pr->used_targets[i].num_requests;
GNUNET_assert (pc > 0);
+ /* FIXME: make re-enabling a peer independent of how often
+ this function is called??? */
if (0 != GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
RETRY_PROBABILITY_INV * pc))
{
#endif
/* 2b) many other requests to this peer */
delay = GNUNET_TIME_absolute_get_duration (cp->last_request_times[cp->last_request_times_off % MAX_QUEUE_PER_PEER]);
- if (delay.value <= cp->avg_delay.value)
+ if (delay.rel_value <= cp->avg_delay.rel_value)
{
#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"NOT sending query since we send %u others to this peer in the last %llums\n",
MAX_QUEUE_PER_PEER,
- cp->avg_delay.value);
+ cp->avg_delay.rel_value);
#endif
return GNUNET_YES; /* skip */
}
score += 1.0; /* likely successful based on hot path */
}
/* 3b) include latency */
- if (cp->avg_delay.value < 4 * TTL_DECREMENT)
+ if (cp->avg_delay.rel_value < 4 * TTL_DECREMENT)
score += 1.0; /* likely fast based on latency */
/* 3c) include priorities */
if (cp->avg_priority <= pr->remaining_priority / 2.0)
if (pr->target_pid == cp->pid)
score += 100.0;
/* store best-fit in closure */
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Peer `%s' gets score %f for forwarding query, max is %f\n",
- GNUNET_h2s (key),
- score,
- psc->target_score);
-#endif
score++; /* avoid zero */
if (score > psc->target_score)
{
psc->target_score = score;
psc->target.hashPubKey = *key;
}
+#if DEBUG_FS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Peer `%s' gets score %f for forwarding query, max is %8f\n",
+ GNUNET_h2s (key),
+ score,
+ psc->target_score);
+#endif
return GNUNET_YES;
}
struct GNUNET_TIME_Relative delay;
pr->task = GNUNET_SCHEDULER_NO_TASK;
- if (pr->irc != NULL)
+ if (pr->pirc != NULL)
{
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_TIME_UNIT_FOREVER_REL,
pr->type,
&pr->query,
+ DEFAULT_GET_REPLICATION,
GNUNET_DHT_RO_NONE,
pr->bf,
pr->mingle,
&process_dht_reply,
pr);
}
+
+ if ( (pr->anonymity_level > 1) &&
+ (cover_query_count < pr->anonymity_level - 1) )
+ {
+ delay = get_processing_delay ();
+#if DEBUG_FS
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Not enough cover traffic to forward query `%s', will try again in %llu ms!\n",
+ GNUNET_h2s (&pr->query),
+ delay.rel_value);
+#endif
+ pr->task = GNUNET_SCHEDULER_add_delayed (delay,
+ &forward_request_task,
+ pr);
+ return;
+ }
+ /* consume cover traffic */
+ if (pr->anonymity_level > 1)
+ cover_query_count -= pr->anonymity_level - 1;
+
/* (1) select target */
psc.pr = pr;
psc.target_score = -DBL_MAX;
+ psc.fast_retry = GNUNET_NO;
GNUNET_CONTAINER_multihashmap_iterate (connected_peers,
&target_peer_select_cb,
&psc);
if (psc.target_score == -DBL_MAX)
{
- delay = get_processing_delay ();
+ if (psc.fast_retry == GNUNET_YES)
+ delay = GNUNET_TIME_UNIT_MILLISECONDS; /* FIXME: store adaptive fast-retry value in 'pr' */
+ else
+ delay = get_processing_delay ();
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"No peer selected for forwarding of query `%s', will try again in %llu ms!\n",
GNUNET_h2s (&pr->query),
- delay.value);
+ delay.rel_value);
#endif
- pr->task = GNUNET_SCHEDULER_add_delayed (sched,
- delay,
+ pr->task = GNUNET_SCHEDULER_add_delayed (delay,
&forward_request_task,
pr);
return; /* nobody selected */
cp = GNUNET_CONTAINER_multihashmap_get (connected_peers,
&psc.target.hashPubKey);
GNUNET_assert (NULL != cp);
- pr->irc = GNUNET_CORE_peer_change_preference (sched, cfg,
+ GNUNET_assert (cp->irc == NULL);
+ pr->pirc = cp;
+ cp->pr = pr;
+ cp->irc = GNUNET_CORE_peer_change_preference (core,
&psc.target,
GNUNET_CONSTANTS_SERVICE_TIMEOUT,
GNUNET_BANDWIDTH_value_init (UINT32_MAX),
cp->inc_preference,
&target_reservation_cb,
pr);
+ GNUNET_assert (cp->irc != NULL);
cp->inc_preference = 0;
}
else
/* force forwarding */
static struct GNUNET_BANDWIDTH_Value32NBO zerobw;
target_reservation_cb (pr, &psc.target,
- zerobw, zerobw, 0, 0.0);
+ zerobw, 0, 0.0);
}
}
*/
uint32_t priority;
+ /**
+ * Anonymity requirements for this reply.
+ */
+ uint32_t anonymity_level;
+
/**
* Evaluation result (returned).
*/
size_t msize;
unsigned int i;
+ if (NULL == pr->client_request_list)
+ {
+ /* reply will go over the network, check for cover traffic */
+ if ( (prq->anonymity_level > 1) &&
+ (cover_content_count < prq->anonymity_level - 1) )
+ {
+ /* insufficient cover traffic, skip */
+ GNUNET_STATISTICS_update (stats,
+ gettext_noop ("# replies suppressed due to lack of cover traffic"),
+ 1,
+ GNUNET_NO);
+ return GNUNET_YES;
+ }
+ if (prq->anonymity_level > 1)
+ cover_content_count -= prq->anonymity_level - 1;
+ }
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Matched result (type %u) for query `%s' with pending request\n",
if (i < pr->used_targets_off)
{
cur_delay = GNUNET_TIME_absolute_get_duration (pr->used_targets[i].last_request_time);
- prq->sender->avg_delay.value
- = (prq->sender->avg_delay.value *
- (RUNAVG_DELAY_N - 1) + cur_delay.value) / RUNAVG_DELAY_N;
+ prq->sender->avg_delay.rel_value
+ = (prq->sender->avg_delay.rel_value *
+ (RUNAVG_DELAY_N - 1) + cur_delay.rel_value) / RUNAVG_DELAY_N;
prq->sender->avg_priority
= (prq->sender->avg_priority *
(RUNAVG_DELAY_N - 1) + pr->priority) / (double) RUNAVG_DELAY_N;
pr->do_remove = GNUNET_YES;
if (pr->task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sched,
- pr->task);
+ GNUNET_SCHEDULER_cancel (pr->task);
pr->task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_break (GNUNET_YES ==
key,
pr));
GNUNET_LOAD_update (rt_entry_lifetime,
- GNUNET_TIME_absolute_get_duration (pr->start_time).value);
+ GNUNET_TIME_absolute_get_duration (pr->start_time).rel_value);
break;
case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
GNUNET_STATISTICS_update (stats,
1,
GNUNET_NO);
#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+/* GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Duplicate response `%s', discarding.\n",
- GNUNET_h2s (&mhash));
+ GNUNET_h2s (&mhash));*/
#endif
return GNUNET_YES; /* duplicate */
case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
= GNUNET_TIME_relative_to_absolute (art_delay);
GNUNET_STATISTICS_update (stats,
gettext_noop ("cummulative artificial delay introduced (ms)"),
- art_delay.value,
+ art_delay.abs_value,
GNUNET_NO);
#endif
reply->msize = msize;
delay = GNUNET_TIME_absolute_get_duration (*start);
GNUNET_free (start);
GNUNET_LOAD_update (datastore_put_load,
- delay.value);
+ delay.rel_value);
if (GNUNET_OK == success)
return;
GNUNET_STATISTICS_update (stats,
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance information
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
handle_p2p_put (void *cls,
const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
const struct PutMessage *put;
uint16_t msize;
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
+ cover_content_count++;
#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received result for query `%s' from peer `%4s'\n",
prq.type = type;
prq.expiration = expiration;
prq.priority = 0;
+ prq.anonymity_level = 1;
prq.finished = GNUNET_NO;
prq.request_found = GNUNET_NO;
GNUNET_CONTAINER_multihashmap_get_multiple (query_request_map,
if (prq.sender != NULL)
{
prq.sender->inc_preference += CONTENT_BANDWIDTH_VALUE + 1000 * prq.priority;
- prq.sender->trust += prq.priority;
+ change_host_trust (prq.sender, prq.priority);
}
- if ( (GNUNET_YES == active_migration) &&
+ if ( (GNUNET_YES == active_to_migration) &&
(GNUNET_NO == test_put_load_too_high (prq.priority)) )
{
#if DEBUG_FS
}
putl = GNUNET_LOAD_get_load (datastore_put_load);
if ( (GNUNET_NO == prq.request_found) &&
- ( (GNUNET_YES != active_migration) ||
+ ( (GNUNET_YES != active_to_migration) ||
(putl > 2.5 * (1 + prq.priority)) ) )
{
cp = GNUNET_CONTAINER_multihashmap_get (connected_peers,
&other->hashPubKey);
- if (GNUNET_TIME_absolute_get_duration (cp->last_migration_block).value < 5000)
+ if (GNUNET_TIME_absolute_get_duration (cp->last_migration_block).rel_value < 5000)
return GNUNET_OK; /* already blocked */
/* We're too busy; send MigrationStop message! */
- if (GNUNET_YES != active_migration)
+ if (GNUNET_YES != active_to_migration)
putl = 1.0 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5);
block_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
5000 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance information
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
handle_p2p_migration_stop (void *cls,
const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct ConnectedPeer *cp;
const struct MigrationStopMessage *msm;
}
/* no more results */
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_now (sched,
- &forward_request_task,
+ pr->task = GNUNET_SCHEDULER_add_now (&forward_request_task,
pr);
return;
}
prq.priority = priority;
prq.finished = GNUNET_NO;
prq.request_found = GNUNET_NO;
+ prq.anonymity_level = anonymity;
if ( (old_rf == 0) &&
(pr->results_found == 0) )
update_datastore_delays (pr->start_time);
GNUNET_NO);
return 0; /* excess resources */
}
- ret = change_host_trust (cp, prio_in);
+ if (prio_in > INT32_MAX)
+ prio_in = INT32_MAX;
+ ret = - change_host_trust (cp, - (int) prio_in);
if (ret > 0)
{
if (ret > current_priorities + N)
1,
GNUNET_NO);
/* undo charge */
- if (ret != 0)
- change_host_trust (cp, -ret);
+ change_host_trust (cp, (int) ret);
return -1; /* not enough resources */
}
else
* @param other the other peer involved (sender or receiver, NULL
* for loopback messages where we are both sender and receiver)
* @param message the actual message
- * @param latency reported latency of the connection with 'other'
- * @param distance reported distance (DV) to 'other'
+ * @param atsi performance information
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
handle_p2p_get (void *cls,
const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- struct GNUNET_TIME_Relative latency,
- uint32_t distance)
+ const struct GNUNET_TRANSPORT_ATS_Information *atsi)
{
struct PendingRequest *pr;
struct ConnectedPeer *cp;
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
+ cover_query_count++;
bm = ntohl (gm->hash_bitmap);
bits = 0;
cps = GNUNET_CONTAINER_multihashmap_get (connected_peers,
}
if ( (GNUNET_LOAD_get_load (cp->transmission_delay) > 3 * (1 + priority)) ||
(GNUNET_LOAD_get_average (cp->transmission_delay) >
- GNUNET_CONSTANTS_MAX_CORK_DELAY.value * 2 + GNUNET_LOAD_get_average (rt_entry_lifetime)) )
+ GNUNET_CONSTANTS_MAX_CORK_DELAY.rel_value * 2 + GNUNET_LOAD_get_average (rt_entry_lifetime)) )
{
/* don't have BW to send to peer, or would likely take longer than we have for it,
so at best indirect the query */
&cdc);
if (cdc.have != NULL)
{
- if (cdc.have->start_time.value + cdc.have->ttl >=
- pr->start_time.value + pr->ttl)
+ if (cdc.have->start_time.abs_value + cdc.have->ttl >=
+ pr->start_time.abs_value + pr->ttl)
{
/* existing request has higher TTL, drop new one! */
cdc.have->priority += pr->priority;
pr->hnode = GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap,
pr,
- pr->start_time.value + pr->ttl);
+ pr->start_time.abs_value + pr->ttl);
GNUNET_STATISTICS_update (stats,
gettext_noop ("# P2P searches received"),
}
default:
if (pr->task == GNUNET_SCHEDULER_NO_TASK)
- pr->task = GNUNET_SCHEDULER_add_now (sched,
- &forward_request_task,
+ pr->task = GNUNET_SCHEDULER_add_now (&forward_request_task,
pr);
}
/**
* Process fs requests.
*
- * @param s scheduler to use
* @param server the initialized server
* @param c configuration to use
*/
static int
-main_init (struct GNUNET_SCHEDULER_Handle *s,
- struct GNUNET_SERVER_Handle *server,
+main_init (struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *c)
{
static const struct GNUNET_CORE_MessageHandler p2p_handlers[] =
};
unsigned long long enc = 128;
- sched = s;
cfg = c;
- stats = GNUNET_STATISTICS_create (sched, "fs", cfg);
+ stats = GNUNET_STATISTICS_create ("fs", cfg);
min_migration_delay = GNUNET_TIME_UNIT_SECONDS;
if ( (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_number (cfg,
rt_entry_lifetime = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_FOREVER_REL);
peer_request_map = GNUNET_CONTAINER_multihashmap_create (enc);
requests_by_expiration_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
- core = GNUNET_CORE_connect (sched,
- cfg,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ core = GNUNET_CORE_connect (cfg,
+ 1, /* larger? */
NULL,
NULL,
&peer_connect_handler,
}
return GNUNET_SYSERR;
}
- /* FIXME: distinguish between sending and storing in options? */
- if (active_migration)
+ if (active_from_migration)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Content migration is enabled, will start to gather data\n"));
"TRUST",
&trustDirectory));
GNUNET_DISK_directory_create (trustDirectory);
- GNUNET_SCHEDULER_add_with_priority (sched,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
&cron_flush_trust, NULL);
GNUNET_SERVER_add_handlers (server, handlers);
- GNUNET_SCHEDULER_add_delayed (sched,
- GNUNET_TIME_UNIT_FOREVER_REL,
+ cover_age_task = GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY,
+ &age_cover_counters,
+ NULL);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task,
NULL);
return GNUNET_OK;
* Process fs requests.
*
* @param cls closure
- * @param sched scheduler to use
* @param server the initialized server
* @param cfg configuration to use
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
struct GNUNET_SERVER_Handle *server,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- active_migration = GNUNET_CONFIGURATION_get_value_yesno (cfg,
- "FS",
- "ACTIVEMIGRATION");
- dsh = GNUNET_DATASTORE_connect (cfg,
- sched);
+ active_to_migration = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "FS",
+ "CONTENT_CACHING");
+ active_from_migration = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "FS",
+ "CONTENT_PUSHING");
+ dsh = GNUNET_DATASTORE_connect (cfg);
if (dsh == NULL)
{
- GNUNET_SCHEDULER_shutdown (sched);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
"fs");
block_ctx = GNUNET_BLOCK_context_create (block_cfg);
GNUNET_assert (NULL != block_ctx);
- dht_handle = GNUNET_DHT_connect (sched,
- cfg,
+ dht_handle = GNUNET_DHT_connect (cfg,
FS_DHT_HT_SIZE);
- if ( (GNUNET_OK != GNUNET_FS_indexing_init (sched, cfg, dsh)) ||
- (GNUNET_OK != main_init (sched, server, cfg)) )
+ if ( (GNUNET_OK != GNUNET_FS_indexing_init (cfg, dsh)) ||
+ (GNUNET_OK != main_init (server, cfg)) )
{
- GNUNET_SCHEDULER_shutdown (sched);
+ GNUNET_SCHEDULER_shutdown ();
GNUNET_DATASTORE_disconnect (dsh, GNUNET_NO);
dsh = NULL;
GNUNET_DHT_disconnect (dht_handle);
projects / oweals / gnunet.git / blobdiff