* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_load_lib.h"
#include "gnunet-service-fs.h"
#include "gnunet-service-fs_cp.h"
#include "gnunet-service-fs_pe.h"
#include "gnunet-service-fs_pr.h"
#include "gnunet-service-fs_push.h"
+#include "gnunet_peerstore_service.h"
+
+
+/**
+ * Ratio for moving average delay calculation. The previous
+ * average goes in with a factor of (n-1) into the calculation.
+ * Must be > 0.
+ */
+#define RUNAVG_DELAY_N 16
/**
- * How often do we flush trust values to disk?
+ * How often do we flush respect values to disk?
*/
-#define TRUST_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
+#define RESPECT_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
/**
* After how long do we discard a reply?
*/
#define REPLY_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 2)
+/**
+ * Collect an instane number of statistics? May cause excessive IPC.
+ */
+#define INSANE_STATISTICS GNUNET_NO
+
/**
* Handle to cancel a transmission request.
*/
struct GSF_PeerTransmitHandle *prev;
- /**
- * Handle for an active request for transmission to this
- * peer, or NULL (if core queue was full).
- */
- struct GNUNET_CORE_TransmitHandle *cth;
-
/**
* Time when this transmission request was issued.
*/
struct GSF_ConnectedPeer *cp;
/**
- * Closure for 'gmc'.
+ * Closure for @e gmc.
*/
void *gmc_cls;
size_t size;
/**
- * Set to 1 if we're currently in the process of calling
- * 'GNUNET_CORE_notify_transmit_ready' (so while cth is
- * NULL, we should not call notify_transmit_ready for this
- * handle right now).
- */
- unsigned int cth_in_progress;
-
- /**
- * GNUNET_YES if this is a query, GNUNET_NO for content.
+ * #GNUNET_YES if this is a query, #GNUNET_NO for content.
*/
int is_query;
struct GSF_PeerTransmitHandle *migration_pth;
/**
- * Context of our GNUNET_CORE_peer_change_preference call (or NULL).
+ * Context of our GNUNET_ATS_reserve_bandwidth call (or NULL).
*/
- struct GNUNET_CORE_InformationRequestContext *irc;
+ struct GNUNET_ATS_ReservationContext *rc;
/**
* Task scheduled if we need to retry bandwidth reservation later.
*/
- GNUNET_SCHEDULER_TaskIdentifier irc_delay_task;
+ GNUNET_SCHEDULER_TaskIdentifier rc_delay_task;
/**
* Active requests from this neighbour, map of query to 'struct PeerRequest'.
*/
struct GNUNET_CONTAINER_MultiHashMap *request_map;
+ /**
+ * Handle for an active request for transmission to this
+ * peer, or NULL (if core queue was full).
+ */
+ struct GNUNET_CORE_TransmitHandle *cth;
+
/**
* Increase in traffic preference still to be submitted
* to the core service for this peer.
uint64_t inc_preference;
/**
- * Trust rating for this peer on disk.
+ * Set to 1 if we're currently in the process of calling
+ * #GNUNET_CORE_notify_transmit_ready() (so while @e cth is
+ * NULL, we should not call notify_transmit_ready for this
+ * handle right now).
+ */
+ unsigned int cth_in_progress;
+
+ /**
+ * Respect rating for this peer on disk.
*/
- uint32_t disk_trust;
+ uint32_t disk_respect;
/**
* Which offset in "last_p2p_replies" will be updated next?
*/
int did_reserve;
-};
+ /**
+ * Function called when the creation of this record is complete.
+ */
+ GSF_ConnectedPeerCreationCallback creation_cb;
+ /**
+ * Closure for @e creation_cb
+ */
+ void *creation_cb_cls;
-/**
- * Map from peer identities to 'struct GSF_ConnectPeer' entries.
- */
-static struct GNUNET_CONTAINER_MultiHashMap *cp_map;
+ /**
+ * Handle to the PEERSTORE iterate request for peer respect value
+ */
+ struct GNUNET_PEERSTORE_IterateContext *respect_iterate_req;
-/**
- * Where do we store trust information?
- */
-static char *trustDirectory;
+};
/**
- * Get the filename under which we would store the GNUNET_HELLO_Message
- * for the given host and protocol.
- * @return filename of the form DIRECTORY/HOSTID
+ * Map from peer identities to 'struct GSF_ConnectPeer' entries.
*/
-static char *
-get_trust_filename (const struct GNUNET_PeerIdentity *id)
-{
- struct GNUNET_CRYPTO_HashAsciiEncoded fil;
- char *fn;
-
- GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
- GNUNET_asprintf (&fn, "%s%s%s", trustDirectory, DIR_SEPARATOR_STR, &fil);
- return fn;
-}
-
+static struct GNUNET_CONTAINER_MultiPeerMap *cp_map;
/**
- * Find latency information in 'atsi'.
- *
- * @param atsi performance data
- * @return connection latency
+ * Handle to peerstore service.
*/
-static struct GNUNET_TIME_Relative
-get_latency (const struct GNUNET_TRANSPORT_ATS_Information *atsi)
-{
- if (atsi == NULL)
- return GNUNET_TIME_UNIT_SECONDS;
- 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));
-}
+static struct GNUNET_PEERSTORE_Handle *peerstore;
/**
- * Update the performance information kept for the given peer.
+ * Update the latency information kept for the given peer.
*
- * @param cp peer record to update
- * @param atsi transport performance data
+ * @param id peer record to update
+ * @param latency current latency value
*/
-static void
-update_atsi (struct GSF_ConnectedPeer *cp,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+void
+GSF_update_peer_latency_ (const struct GNUNET_PeerIdentity *id,
+ struct GNUNET_TIME_Relative latency)
{
- struct GNUNET_TIME_Relative latency;
+ struct GSF_ConnectedPeer *cp;
- latency = get_latency (atsi);
+ cp = GSF_peer_get_ (id);
+ if (NULL == cp)
+ return; /* we're not yet connected at the core level, ignore */
GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay, latency);
/* LATER: merge atsi into cp's performance data (if we ever care...) */
}
/**
* Return the performance data record for the given peer
- *
+ *
* @param cp peer to query
* @return performance data record for the peer
*/
* @param buf where to copy the message
* @return number of bytes copied to buf
*/
-static size_t peer_transmit_ready_cb (void *cls, size_t size, void *buf);
-
-
+static size_t
+peer_transmit_ready_cb (void *cls, size_t size, void *buf);
/**
*
* @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request
* @param peer identifies the peer
- * @param bandwidth_out available amount of outbound bandwidth
* @param amount set to the amount that was actually reserved or unreserved;
* either the full requested amount or zero (no partial reservations)
* @param res_delay if the reservation could not be satisfied (amount was 0), how
* long should the client wait until re-trying?
- * @param preference current traffic preference for the given peer
*/
static void
-core_reserve_callback (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- int32_t amount,
- struct GNUNET_TIME_Relative res_delay,
- uint64_t preference);
+ats_reserve_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
+ int32_t amount, struct GNUNET_TIME_Relative res_delay);
/**
{
struct GSF_ConnectedPeer *cp;
struct GNUNET_PeerIdentity target;
- uint64_t ip;
- if ((NULL != pth->cth) || (0 != pth->cth_in_progress))
- return; /* already done */
cp = pth->cp;
+ if ((NULL != cp->cth) || (0 != cp->cth_in_progress))
+ return; /* already done */
GNUNET_assert (0 != cp->ppd.pid);
GNUNET_PEER_resolve (cp->ppd.pid, &target);
+
+ if (0 != cp->inc_preference)
+ {
+ GNUNET_ATS_performance_change_preference (GSF_ats, &target, GNUNET_ATS_PREFERENCE_BANDWIDTH,
+ (double) cp->inc_preference,
+ GNUNET_ATS_PREFERENCE_END);
+ cp->inc_preference = 0;
+ }
+
if ((GNUNET_YES == pth->is_query) && (GNUNET_YES != pth->was_reserved))
{
/* query, need reservation */
cp->did_reserve = GNUNET_NO;
/* reservation already done! */
pth->was_reserved = GNUNET_YES;
- ip = cp->inc_preference;
- cp->inc_preference = 0;
- cp->irc = GNUNET_CORE_peer_change_preference (GSF_core,
- &target,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BANDWIDTH_VALUE_MAX,
- DBLOCK_SIZE,
- ip,
- &core_reserve_callback, cp);
+ cp->rc =
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, &target, DBLOCK_SIZE,
+ &ats_reserve_callback, cp);
+ return;
}
- GNUNET_assert (pth->cth == NULL);
- pth->cth_in_progress++;
- pth->cth = GNUNET_CORE_notify_transmit_ready (GSF_core,
- GNUNET_YES,
- pth->priority,
- GNUNET_TIME_absolute_get_remaining
- (pth->timeout), &target,
- pth->size,
- &peer_transmit_ready_cb, pth);
- GNUNET_assert (0 < pth->cth_in_progress--);
+ GNUNET_assert (NULL == cp->cth);
+ cp->cth_in_progress++;
+ cp->cth =
+ GNUNET_CORE_notify_transmit_ready (GSF_core, GNUNET_YES,
+ GNUNET_CORE_PRIO_BACKGROUND,
+ GNUNET_TIME_absolute_get_remaining
+ (pth->timeout), &target, pth->size,
+ &peer_transmit_ready_cb, cp);
+ GNUNET_assert (NULL != cp->cth);
+ GNUNET_assert (0 < cp->cth_in_progress--);
}
static size_t
peer_transmit_ready_cb (void *cls, size_t size, void *buf)
{
- struct GSF_PeerTransmitHandle *pth = cls;
+ struct GSF_ConnectedPeer *cp = cls;
+ struct GSF_PeerTransmitHandle *pth = cp->pth_head;
struct GSF_PeerTransmitHandle *pos;
- struct GSF_ConnectedPeer *cp;
size_t ret;
- GNUNET_assert ((NULL == buf) || (pth->size <= size));
- pth->cth = NULL;
- if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ cp->cth = NULL;
+ if (NULL == pth)
+ return 0;
+ if (pth->size > size)
+ {
+ schedule_transmission (pth);
+ return 0;
+ }
+ if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task)
{
GNUNET_SCHEDULER_cancel (pth->timeout_task);
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- cp = pth->cp;
GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth);
if (GNUNET_YES == pth->is_query)
{
}
GNUNET_LOAD_update (cp->ppd.transmission_delay,
GNUNET_TIME_absolute_get_duration
- (pth->transmission_request_start_time).rel_value);
+ (pth->transmission_request_start_time).rel_value_us);
ret = pth->gmc (pth->gmc_cls, size, buf);
- GNUNET_assert (NULL == pth->cth);
- for (pos = cp->pth_head; pos != NULL; pos = pos->next)
+ if (NULL != (pos = cp->pth_head))
{
GNUNET_assert (pos != pth);
schedule_transmission (pos);
}
- GNUNET_assert (pth->cth == NULL);
- GNUNET_assert (pth->cth_in_progress == 0);
GNUNET_free (pth);
return ret;
}
retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GSF_ConnectedPeer *cp = cls;
- uint64_t ip;
struct GNUNET_PeerIdentity target;
GNUNET_PEER_resolve (cp->ppd.pid, &target);
- cp->irc_delay_task = GNUNET_SCHEDULER_NO_TASK;
- ip = cp->inc_preference;
- cp->inc_preference = 0;
- cp->irc = GNUNET_CORE_peer_change_preference (GSF_core,
- &target,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BANDWIDTH_VALUE_MAX,
- DBLOCK_SIZE,
- ip, &core_reserve_callback, cp);
+ cp->rc_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ cp->rc =
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, &target, DBLOCK_SIZE,
+ &ats_reserve_callback, cp);
}
*
* @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request
* @param peer identifies the peer
- * @param bandwidth_out available amount of outbound bandwidth
* @param amount set to the amount that was actually reserved or unreserved;
* either the full requested amount or zero (no partial reservations)
* @param res_delay if the reservation could not be satisfied (amount was 0), how
* long should the client wait until re-trying?
- * @param preference current traffic preference for the given peer
*/
static void
-core_reserve_callback (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- int32_t amount,
- struct GNUNET_TIME_Relative res_delay,
- uint64_t preference)
+ats_reserve_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
+ int32_t amount, struct GNUNET_TIME_Relative res_delay)
{
struct GSF_ConnectedPeer *cp = cls;
struct GSF_PeerTransmitHandle *pth;
- cp->irc = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Reserved %d bytes / need to wait %s for reservation\n",
+ (int) amount,
+ GNUNET_STRINGS_relative_time_to_string (res_delay, GNUNET_YES));
+ cp->rc = NULL;
if (0 == amount)
{
- cp->irc_delay_task = GNUNET_SCHEDULER_add_delayed (res_delay,
- &retry_reservation, cp);
+ cp->rc_delay_task =
+ GNUNET_SCHEDULER_add_delayed (res_delay, &retry_reservation, cp);
return;
}
cp->did_reserve = GNUNET_YES;
pth = cp->pth_head;
- if ((NULL != pth) && (NULL == pth->cth))
+ if ((NULL != pth) && (NULL == cp->cth) && (0 == cp->cth_in_progress))
{
/* reservation success, try transmission now! */
- pth->cth_in_progress++;
- pth->cth = GNUNET_CORE_notify_transmit_ready (GSF_core,
- GNUNET_YES,
- pth->priority,
- GNUNET_TIME_absolute_get_remaining
- (pth->timeout), peer,
- pth->size,
- &peer_transmit_ready_cb, pth);
- GNUNET_assert (0 < pth->cth_in_progress--);
+ cp->cth_in_progress++;
+ cp->cth =
+ GNUNET_CORE_notify_transmit_ready (GSF_core, GNUNET_YES,
+ GNUNET_CORE_PRIO_BACKGROUND,
+ GNUNET_TIME_absolute_get_remaining
+ (pth->timeout), peer, pth->size,
+ &peer_transmit_ready_cb, cp);
+ GNUNET_assert (NULL != cp->cth);
+ GNUNET_assert (0 < cp->cth_in_progress--);
}
}
+/**
+ * Function called by PEERSTORE with peer respect record
+ *
+ * @param cls handle to connected peer entry
+ * @param record peerstore record information
+ * @param emsg error message, or NULL if no errors
+ * @return #GNUNET_NO to stop iterating since we only expect 0 or 1 records
+ */
+static int
+peer_respect_cb (void *cls, struct GNUNET_PEERSTORE_Record *record, char *emsg)
+{
+ struct GSF_ConnectedPeer *cp = cls;
+
+ cp->respect_iterate_req = NULL;
+ if ((NULL != record) && (sizeof (cp->disk_respect) == record->value_size))
+ cp->disk_respect = cp->ppd.respect = *((uint32_t *)record->value);
+ GSF_push_start_ (cp);
+ if (NULL != cp->creation_cb)
+ cp->creation_cb (cp->creation_cb_cls, cp);
+ return GNUNET_NO;
+}
/**
* A peer connected to us. Setup the connected peer
* records.
*
* @param peer identity of peer that connected
- * @param atsi performance data for the connection
- * @return handle to connected peer entry
+ * @param creation_cb callback function when the record is created.
+ * @param creation_cb_cls closure for @creation_cb
*/
-struct GSF_ConnectedPeer *
+void
GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ GSF_ConnectedPeerCreationCallback creation_cb,
+ void *creation_cb_cls)
{
struct GSF_ConnectedPeer *cp;
- char *fn;
- uint32_t trust;
- cp = GNUNET_malloc (sizeof (struct GSF_ConnectedPeer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s\n",
+ GNUNET_i2s (peer));
+ cp = GNUNET_new (struct GSF_ConnectedPeer);
cp->ppd.pid = GNUNET_PEER_intern (peer);
cp->ppd.transmission_delay = GNUNET_LOAD_value_init (GNUNET_TIME_UNIT_ZERO);
- cp->irc = GNUNET_CORE_peer_change_preference (GSF_core,
- peer,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_BANDWIDTH_VALUE_MAX,
- DBLOCK_SIZE,
- 0, &core_reserve_callback, cp);
- fn = get_trust_filename (peer);
- if ((GNUNET_DISK_file_test (fn) == GNUNET_YES) &&
- (sizeof (trust) == GNUNET_DISK_fn_read (fn, &trust, sizeof (trust))))
- cp->disk_trust = cp->ppd.trust = ntohl (trust);
- GNUNET_free (fn);
- cp->request_map = GNUNET_CONTAINER_multihashmap_create (128);
+ cp->rc =
+ GNUNET_ATS_reserve_bandwidth (GSF_ats, peer, DBLOCK_SIZE,
+ &ats_reserve_callback, cp);
+ cp->request_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO);
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (cp_map,
- &peer->hashPubKey,
+ GNUNET_CONTAINER_multipeermap_put (cp_map,
+ GSF_connected_peer_get_identity2_ (cp),
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- update_atsi (cp, atsi);
- GSF_push_start_ (cp);
- return cp;
+ GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
+ GNUNET_CONTAINER_multipeermap_size (cp_map),
+ GNUNET_NO);
+ cp->creation_cb = creation_cb;
+ cp->creation_cb_cls = creation_cb_cls;
+ cp->respect_iterate_req =
+ GNUNET_PEERSTORE_iterate (peerstore, "fs", peer, "respect",
+ GNUNET_TIME_UNIT_FOREVER_REL, &peer_respect_cb,
+ cp);
}
cp->mig_revive_task = GNUNET_SCHEDULER_NO_TASK;
bt = GNUNET_TIME_absolute_get_remaining (cp->ppd.migration_blocked_until);
- if (0 != bt.rel_value)
+ if (0 != bt.rel_value_us)
{
/* still time left... */
- cp->mig_revive_task
- = GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
+ cp->mig_revive_task =
+ GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
return;
}
GSF_push_start_ (cp);
{
if (NULL == cp_map)
return NULL;
- return GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey);
+ return GNUNET_CONTAINER_multipeermap_get (cp_map, peer);
}
* @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 atsi performance information
* @return GNUNET_OK to keep the connection open,
* GNUNET_SYSERR to close it (signal serious error)
*/
int
GSF_handle_p2p_migration_stop_ (void *cls,
const struct GNUNET_PeerIdentity *other,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information
- *atsi)
+ const struct GNUNET_MessageHeader *message)
{
struct GSF_ConnectedPeer *cp;
const struct MigrationStopMessage *msm;
struct GNUNET_TIME_Relative bt;
msm = (const struct MigrationStopMessage *) message;
- cp = GNUNET_CONTAINER_multihashmap_get (cp_map, &other->hashPubKey);
- if (cp == NULL)
+ cp = GSF_peer_get_ (other);
+ if (NULL == cp)
{
GNUNET_break (0);
return GNUNET_OK;
}
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# migration stop messages received"),
+ 1, GNUNET_NO);
bt = GNUNET_TIME_relative_ntoh (msm->duration);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Migration of content to peer `%s' blocked for %llu ms\n"),
- GNUNET_i2s (other), (unsigned long long) bt.rel_value);
+ _("Migration of content to peer `%s' blocked for %s\n"),
+ GNUNET_i2s (other),
+ GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES));
cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt);
- if (cp->mig_revive_task == GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK == cp->mig_revive_task)
{
GSF_push_stop_ (cp);
- cp->mig_revive_task
- = GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
+ cp->mig_revive_task =
+ GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp);
}
- update_atsi (cp, atsi);
return GNUNET_OK;
}
struct PutMessage *pm = cls;
size_t size;
- if (buf != NULL)
+ if (NULL != buf)
{
GNUNET_assert (buf_size >= ntohs (pm->header.size));
size = ntohs (pm->header.size);
else
{
size = 0;
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# replies dropped"), 1, GNUNET_NO);
+ GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# replies dropped"), 1,
+ GNUNET_NO);
}
GNUNET_free (pm);
return size;
}
+/**
+ * Free resources associated with the given peer request.
+ *
+ * @param peerreq request to free
+ * @param query associated key for the request
+ */
+static void
+free_pending_request (struct PeerRequest *peerreq,
+ const struct GNUNET_HashCode *query)
+{
+ struct GSF_ConnectedPeer *cp = peerreq->cp;
+
+ if (GNUNET_SCHEDULER_NO_TASK != peerreq->kill_task)
+ {
+ GNUNET_SCHEDULER_cancel (peerreq->kill_task);
+ peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# P2P searches active"),
+ -1, GNUNET_NO);
+ GNUNET_break (GNUNET_YES ==
+ GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
+ query, peerreq));
+ GNUNET_free (peerreq);
+}
+
+
/**
* Cancel all requests associated with the peer.
*
* @return GNUNET_YES (continue to iterate)
*/
static int
-cancel_pending_request (void *cls, const GNUNET_HashCode * query, void *value)
+cancel_pending_request (void *cls, const struct GNUNET_HashCode * query, void *value)
{
struct PeerRequest *peerreq = value;
struct GSF_PendingRequest *pr = peerreq->pr;
- struct GSF_ConnectedPeer *cp = peerreq->cp;
struct GSF_PendingRequestData *prd;
- if (peerreq->kill_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (peerreq->kill_task);
- peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# P2P searches active"),
- -1, GNUNET_NO);
prd = GSF_pending_request_get_data_ (pr);
- GNUNET_break (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
- &prd->query, peerreq));
GSF_pending_request_cancel_ (pr, GNUNET_NO);
- GNUNET_free (peerreq);
+ free_pending_request (peerreq, &prd->query);
return GNUNET_OK;
}
GNUNET_free (dh);
return;
}
- (void) GSF_peer_transmit_ (cp, GNUNET_NO,
- UINT32_MAX,
- REPLY_TIMEOUT, dh->msize, ©_reply, dh->pm);
+ (void) GSF_peer_transmit_ (cp, GNUNET_NO, UINT32_MAX, REPLY_TIMEOUT,
+ dh->msize, ©_reply, dh->pm);
GNUNET_free (dh);
}
/**
* Get the randomized delay a response should be subjected to.
- *
+ *
* @return desired delay
*/
static struct GNUNET_TIME_Relative
{
struct GNUNET_TIME_Relative ret;
- /* FIXME: replace 5000 with something relating to current observed P2P message latency */
- ret = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- GNUNET_CRYPTO_random_u32
- (GNUNET_CRYPTO_QUALITY_WEAK, 5000));
+ ret =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ GNUNET_CRYPTO_random_u32
+ (GNUNET_CRYPTO_QUALITY_WEAK,
+ 2 * GSF_avg_latency.rel_value_us + 1));
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# artificial delays introduced (ms)"),
- ret.rel_value, GNUNET_NO);
-
+ ret.rel_value_us / 1000LL, GNUNET_NO);
+#endif
return ret;
}
* Handle a reply to a pending request. Also called if a request
* expires (then with data == NULL). The handler may be called
* many times (depending on the request type), but will not be
- * called during or after a call to GSF_pending_request_cancel
+ * called during or after a call to GSF_pending_request_cancel
* and will also not be called anymore after a call signalling
* expiration.
*
* @param pr handle to the original pending request
* @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
* @param expiration when does 'data' expire?
+ * @param last_transmission when did we last transmit a request for this block
* @param type type of the block
* @param data response data, NULL on request expiration
* @param data_len number of bytes in data
*/
static void
-handle_p2p_reply (void *cls,
- enum GNUNET_BLOCK_EvaluationResult eval,
- struct GSF_PendingRequest *pr,
- uint32_t reply_anonymity_level,
+handle_p2p_reply (void *cls, enum GNUNET_BLOCK_EvaluationResult eval,
+ struct GSF_PendingRequest *pr, uint32_t reply_anonymity_level,
struct GNUNET_TIME_Absolute expiration,
- enum GNUNET_BLOCK_Type type,
- const void *data, size_t data_len)
+ struct GNUNET_TIME_Absolute last_transmission,
+ enum GNUNET_BLOCK_Type type, const void *data,
+ size_t data_len)
{
struct PeerRequest *peerreq = cls;
struct GSF_ConnectedPeer *cp = peerreq->cp;
prd = GSF_pending_request_get_data_ (pr);
if (NULL == data)
{
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# P2P searches active"),
- -1, GNUNET_NO);
- GNUNET_break (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
- &prd->query, peerreq));
- GNUNET_free (peerreq);
+ free_pending_request (peerreq, &prd->query);
return;
}
- GNUNET_break (type != GNUNET_BLOCK_TYPE_ANY);
- if ((prd->type != type) && (prd->type != GNUNET_BLOCK_TYPE_ANY))
+ GNUNET_break (GNUNET_BLOCK_TYPE_ANY != type);
+ if ((prd->type != type) && (GNUNET_BLOCK_TYPE_ANY != prd->type))
{
- GNUNET_break (0);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# replies dropped due to type mismatch"),
+ 1, GNUNET_NO);
return;
}
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Transmitting result for query `%s' to peer\n",
GNUNET_h2s (&prd->query));
-#endif
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop ("# replies received for other peers"),
1, GNUNET_NO);
GNUNET_break (0);
return;
}
- if ((reply_anonymity_level != UINT32_MAX) && (reply_anonymity_level > 1))
+ if ((UINT32_MAX != reply_anonymity_level) && (reply_anonymity_level > 1))
{
if (reply_anonymity_level - 1 > GSF_cover_content_count)
{
pm->type = htonl (type);
pm->expiration = GNUNET_TIME_absolute_hton (expiration);
memcpy (&pm[1], data, data_len);
- if ((reply_anonymity_level != UINT32_MAX) &&
- (reply_anonymity_level != 0) &&
- (GSF_enable_randomized_delays == GNUNET_YES))
+ if ((UINT32_MAX != reply_anonymity_level) && (0 != reply_anonymity_level) &&
+ (GNUNET_YES == GSF_enable_randomized_delays))
{
struct GSF_DelayedHandle *dh;
- dh = GNUNET_malloc (sizeof (struct GSF_DelayedHandle));
+ dh = GNUNET_new (struct GSF_DelayedHandle);
dh->cp = cp;
dh->pm = pm;
dh->msize = msize;
GNUNET_CONTAINER_DLL_insert (cp->delayed_head, cp->delayed_tail, dh);
- dh->delay_task = GNUNET_SCHEDULER_add_delayed (get_randomized_delay (),
- &transmit_delayed_now, dh);
+ dh->delay_task =
+ GNUNET_SCHEDULER_add_delayed (get_randomized_delay (),
+ &transmit_delayed_now, dh);
}
else
{
- (void) GSF_peer_transmit_ (cp, GNUNET_NO,
- UINT32_MAX,
- REPLY_TIMEOUT, msize, ©_reply, pm);
+ (void) GSF_peer_transmit_ (cp, GNUNET_NO, UINT32_MAX, REPLY_TIMEOUT, msize,
+ ©_reply, pm);
}
- if (eval != GNUNET_BLOCK_EVALUATION_OK_LAST)
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != eval)
return;
if (GNUNET_SCHEDULER_NO_TASK == peerreq->kill_task)
{
/**
- * Increase the host credit by a value.
+ * Increase the peer's respect by a value.
*
- * @param cp which peer to change the trust value on
+ * @param cp which peer to change the respect value on
* @param value is the int value by which the
- * host credit is to be increased or decreased
- * @returns the actual change in trust (positive or negative)
+ * peer's credit is to be increased or decreased
+ * @returns the actual change in respect (positive or negative)
*/
static int
-change_host_trust (struct GSF_ConnectedPeer *cp, int value)
+change_peer_respect (struct GSF_ConnectedPeer *cp, int value)
{
- if (value == 0)
+ if (0 == value)
return 0;
- GNUNET_assert (cp != NULL);
+ GNUNET_assert (NULL != cp);
if (value > 0)
{
- if (cp->ppd.trust + value < cp->ppd.trust)
+ if (cp->ppd.respect + value < cp->ppd.respect)
{
- value = UINT32_MAX - cp->ppd.trust;
- cp->ppd.trust = UINT32_MAX;
+ value = UINT32_MAX - cp->ppd.respect;
+ cp->ppd.respect = UINT32_MAX;
}
else
- cp->ppd.trust += value;
+ cp->ppd.respect += value;
}
else
{
- if (cp->ppd.trust < -value)
+ if (cp->ppd.respect < -value)
{
- value = -cp->ppd.trust;
- cp->ppd.trust = 0;
+ value = -cp->ppd.respect;
+ cp->ppd.respect = 0;
}
else
- cp->ppd.trust += value;
+ cp->ppd.respect += value;
}
return value;
}
/**
* We've received a request with the specified priority. Bound it
- * according to how much we trust the given peer.
- *
+ * according to how much we respect the given peer.
+ *
* @param prio_in requested priority
* @param cp the peer making the request
* @return effective priority
int ld;
ld = GSF_test_get_load_too_high_ (0);
- if (ld == GNUNET_SYSERR)
+ if (GNUNET_SYSERR == ld)
{
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests done for free (low load)"), 1,
GNUNET_NO);
+#endif
return 0; /* excess resources */
}
if (prio_in > INT32_MAX)
prio_in = INT32_MAX;
- ret = -change_host_trust (cp, -(int) prio_in);
+ ret = -change_peer_respect (cp, -(int) prio_in);
if (ret > 0)
{
if (ret > GSF_current_priorities + N)
rret = ret;
GSF_current_priorities = (GSF_current_priorities * (N - 1) + rret) / N;
}
- if ((ld == GNUNET_YES) && (ret > 0))
+ if ((GNUNET_YES == ld) && (ret > 0))
{
/* try with charging */
ld = GSF_test_get_load_too_high_ (ret);
}
- if (ld == GNUNET_YES)
+ if (GNUNET_YES == ld)
{
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# request dropped, priority insufficient"), 1,
GNUNET_NO);
/* undo charge */
- change_host_trust (cp, (int) ret);
+ change_peer_respect (cp, (int) ret);
return -1; /* not enough resources */
}
else
struct GSF_PendingRequestData *prd;
struct GSF_ConnectedPeer *cp;
struct GSF_ConnectedPeer *cps;
- const GNUNET_HashCode *namespace;
const struct GNUNET_PeerIdentity *target;
enum GSF_PendingRequestOptions options;
uint16_t msize;
const struct GetMessage *gm;
unsigned int bits;
- const GNUNET_HashCode *opt;
+ const struct GNUNET_PeerIdentity *opt;
uint32_t bm;
size_t bfsize;
uint32_t ttl_decrement;
bits++;
bm >>= 1;
}
- if (msize < sizeof (struct GetMessage) + bits * sizeof (GNUNET_HashCode))
+ if (msize < sizeof (struct GetMessage) + bits * sizeof (struct GNUNET_PeerIdentity))
{
GNUNET_break_op (0);
return NULL;
}
- opt = (const GNUNET_HashCode *) &gm[1];
- bfsize = msize - sizeof (struct GetMessage) - bits * sizeof (GNUNET_HashCode);
+ opt = (const struct GNUNET_PeerIdentity *) &gm[1];
+ bfsize = msize - sizeof (struct GetMessage) - bits * sizeof (struct GNUNET_PeerIdentity);
/* bfsize must be power of 2, check! */
if (0 != ((bfsize - 1) & bfsize))
{
GSF_cover_query_count++;
bm = ntohl (gm->hash_bitmap);
bits = 0;
- cps = GNUNET_CONTAINER_multihashmap_get (cp_map, &other->hashPubKey);
+ cps = GSF_peer_get_ (other);
if (NULL == cps)
{
/* peer must have just disconnected */
return NULL;
}
if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
- cp = GNUNET_CONTAINER_multihashmap_get (cp_map, &opt[bits++]);
+ cp = GSF_peer_get_ (&opt[bits++]);
else
cp = cps;
- if (cp == NULL)
+ if (NULL == cp)
{
-#if DEBUG_FS
if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO))
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to find RETURN-TO peer `%4s' in connection set. Dropping query.\n",
- GNUNET_i2s ((const struct GNUNET_PeerIdentity *)
- &opt[bits - 1]));
+ GNUNET_i2s (&opt[bits - 1]));
else
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to find peer `%4s' in connection set. Dropping query.\n",
GNUNET_i2s (other));
-#endif
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests dropped due to missing reverse route"),
1, GNUNET_NO);
+#endif
return NULL;
}
/* note that we can really only check load here since otherwise
priority = bound_priority (ntohl (gm->priority), cps);
if (priority < 0)
{
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Dropping query from `%s', this peer is too busy.\n",
GNUNET_i2s (other));
-#endif
return NULL;
}
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for `%s' of type %u from peer `%4s' with flags %u\n",
GNUNET_h2s (&gm->query),
- (unsigned int) type, GNUNET_i2s (other), (unsigned int) bm);
-#endif
- namespace = (0 != (bm & GET_MESSAGE_BIT_SKS_NAMESPACE)) ? &opt[bits++] : NULL;
- if ((type == GNUNET_BLOCK_TYPE_FS_SBLOCK) && (namespace == NULL))
- {
- GNUNET_break_op (0);
- return NULL;
- }
- if ((type != GNUNET_BLOCK_TYPE_FS_SBLOCK) && (namespace != NULL))
- {
- GNUNET_break_op (0);
- return NULL;
- }
+ (unsigned int) type,
+ GNUNET_i2s (other),
+ (unsigned int) bm);
target =
(0 !=
- (bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? ((const struct GNUNET_PeerIdentity
- *) &opt[bits++]) : NULL;
- options = 0;
+ (bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? (&opt[bits++]) : NULL;
+ options = GSF_PRO_DEFAULTS;
spid = 0;
if ((GNUNET_LOAD_get_load (cp->ppd.transmission_delay) > 3 * (1 + priority))
|| (GNUNET_LOAD_get_average (cp->ppd.transmission_delay) >
- GNUNET_CONSTANTS_MAX_CORK_DELAY.rel_value * 2 +
+ GNUNET_CONSTANTS_MAX_CORK_DELAY.rel_value_us * 2 +
GNUNET_LOAD_get_average (GSF_rt_entry_lifetime)))
{
/* don't have BW to send to peer, or would likely take longer than we have for it,
}
ttl = bound_ttl (ntohl (gm->ttl), priority);
/* decrement ttl (always) */
- ttl_decrement = 2 * TTL_DECREMENT +
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, TTL_DECREMENT);
+ ttl_decrement =
+ 2 * TTL_DECREMENT + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ TTL_DECREMENT);
if ((ttl < 0) && (((int32_t) (ttl - ttl_decrement)) > 0))
{
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Dropping query from `%s' due to TTL underflow (%d - %u).\n",
GNUNET_i2s (other), ttl, ttl_decrement);
-#endif
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests dropped due TTL underflow"), 1,
{
pr = peerreq->pr;
prd = GSF_pending_request_get_data_ (pr);
- if ((prd->type == type) &&
- ((type != GNUNET_BLOCK_TYPE_FS_SBLOCK) ||
- (0 == memcmp (&prd->namespace, namespace, sizeof (GNUNET_HashCode)))))
+ if (prd->type == type)
{
- if (prd->ttl.abs_value >= GNUNET_TIME_absolute_get ().abs_value + ttl)
+ if (prd->ttl.abs_value_us >= GNUNET_TIME_absolute_get ().abs_value_us + ttl * 1000LL)
{
/* existing request has higher TTL, drop new one! */
prd->priority += priority;
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Have existing request with higher TTL, dropping new request.\n",
GNUNET_i2s (other));
-#endif
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests dropped due to higher-TTL request"),
return NULL;
}
/* existing request has lower TTL, drop old one! */
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# P2P searches active"),
- -1, GNUNET_NO);
priority += prd->priority;
GSF_pending_request_cancel_ (pr, GNUNET_YES);
- GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (cp->request_map,
- &gm->query,
- peerreq));
- if (peerreq->kill_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (peerreq->kill_task);
- peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK;
- }
- GNUNET_free (peerreq);
+ free_pending_request (peerreq, &gm->query);
}
}
- peerreq = GNUNET_malloc (sizeof (struct PeerRequest));
+ peerreq = GNUNET_new (struct PeerRequest);
peerreq->cp = cp;
- pr = GSF_pending_request_create_ (options,
- type,
- &gm->query,
- namespace,
+ pr = GSF_pending_request_create_ (options, type, &gm->query,
target,
(bfsize >
0) ? (const char *) &opt[bits] : NULL,
bfsize, ntohl (gm->filter_mutator),
1 /* anonymity */ ,
- (uint32_t) priority, ttl, spid, NULL, 0, /* replies_seen */
+ (uint32_t) priority, ttl, spid, GNUNET_PEER_intern (other), NULL, 0, /* replies_seen */
&handle_p2p_reply, peerreq);
GNUNET_assert (NULL != pr);
peerreq->pr = pr;
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (cp->request_map,
- &gm->query,
+ GNUNET_CONTAINER_multihashmap_put (cp->request_map, &gm->query,
peerreq,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
GNUNET_STATISTICS_update (GSF_stats,
* Function called if there has been a timeout trying to satisfy
* a transmission request.
*
- * @param cls the 'struct GSF_PeerTransmitHandle' of the request
+ * @param cls the 'struct GSF_PeerTransmitHandle' of the request
* @param tc scheduler context
*/
static void
struct GSF_PeerTransmitHandle *pth = cls;
struct GSF_ConnectedPeer *cp;
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Timeout trying to transmit to other peer\n");
-#endif
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
cp = pth->cp;
GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth);
else if (GNUNET_NO == pth->is_query)
GNUNET_assert (0 < cp->ppd.pending_replies--);
GNUNET_LOAD_update (cp->ppd.transmission_delay, UINT64_MAX);
- if (NULL != pth->cth)
+ if (NULL != cp->cth)
{
- GNUNET_CORE_notify_transmit_ready_cancel (pth->cth);
- pth->cth = NULL;
+ GNUNET_CORE_notify_transmit_ready_cancel (cp->cth);
+ cp->cth = NULL;
}
pth->gmc (pth->gmc_cls, 0, NULL);
- GNUNET_assert (0 == pth->cth_in_progress);
+ GNUNET_assert (0 == cp->cth_in_progress);
GNUNET_free (pth);
}
/**
* Transmit a message to the given peer as soon as possible.
* If the peer disconnects before the transmission can happen,
- * the callback is invoked with a 'NULL' buffer.
+ * the callback is invoked with a `NULL` @a buffer.
*
* @param cp target peer
- * @param is_query is this a query (GNUNET_YES) or content (GNUNET_NO) or neither (GNUNET_SYSERR)
+ * @param is_query is this a query (#GNUNET_YES) or content (#GNUNET_NO) or neither (#GNUNET_SYSERR)
* @param priority how important is this request?
* @param timeout when does this request timeout (call gmc with error)
* @param size number of bytes we would like to send to the peer
* @param gmc function to call to get the message
- * @param gmc_cls closure for gmc
+ * @param gmc_cls closure for @a gmc
* @return handle to cancel request
*/
struct GSF_PeerTransmitHandle *
-GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp,
- int is_query,
- uint32_t priority,
- struct GNUNET_TIME_Relative timeout,
+GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp, int is_query,
+ uint32_t priority, struct GNUNET_TIME_Relative timeout,
size_t size, GSF_GetMessageCallback gmc, void *gmc_cls)
{
struct GSF_PeerTransmitHandle *pth;
struct GSF_PeerTransmitHandle *pos;
struct GSF_PeerTransmitHandle *prev;
- pth = GNUNET_malloc (sizeof (struct GSF_PeerTransmitHandle));
+ pth = GNUNET_new (struct GSF_PeerTransmitHandle);
pth->transmission_request_start_time = GNUNET_TIME_absolute_get ();
pth->timeout = GNUNET_TIME_relative_to_absolute (timeout);
pth->gmc = gmc;
/* insertion sort (by priority, descending) */
prev = NULL;
pos = cp->pth_head;
- while ((pos != NULL) && (pos->priority > priority))
+ while ((NULL != pos) && (pos->priority > priority))
{
prev = pos;
pos = pos->next;
}
- if (prev == NULL)
- GNUNET_CONTAINER_DLL_insert (cp->pth_head, cp->pth_tail, pth);
- else
- GNUNET_CONTAINER_DLL_insert_after (cp->pth_head, cp->pth_tail, prev, pth);
+ GNUNET_CONTAINER_DLL_insert_after (cp->pth_head, cp->pth_tail, prev, pth);
if (GNUNET_YES == is_query)
cp->ppd.pending_queries++;
else if (GNUNET_NO == is_query)
cp->ppd.pending_replies++;
- pth->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
- &peer_transmit_timeout,
- pth);
+ pth->timeout_task =
+ GNUNET_SCHEDULER_add_delayed (timeout, &peer_transmit_timeout, pth);
schedule_transmission (pth);
return pth;
}
{
struct GSF_ConnectedPeer *cp;
- if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task)
{
GNUNET_SCHEDULER_cancel (pth->timeout_task);
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (NULL != pth->cth)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (pth->cth);
- pth->cth = NULL;
- }
cp = pth->cp;
GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth);
if (GNUNET_YES == pth->is_query)
GNUNET_assert (0 < cp->ppd.pending_queries--);
else if (GNUNET_NO == pth->is_query)
GNUNET_assert (0 < cp->ppd.pending_replies--);
- GNUNET_assert (0 == pth->cth_in_progress);
GNUNET_free (pth);
}
struct GNUNET_TIME_Relative delay;
delay = GNUNET_TIME_absolute_get_duration (request_time);
- cp->ppd.avg_reply_delay.rel_value =
- (cp->ppd.avg_reply_delay.rel_value * (RUNAVG_DELAY_N - 1) +
- delay.rel_value) / RUNAVG_DELAY_N;
+ cp->ppd.avg_reply_delay.rel_value_us =
+ (cp->ppd.avg_reply_delay.rel_value_us * (RUNAVG_DELAY_N - 1) +
+ delay.rel_value_us) / RUNAVG_DELAY_N;
cp->ppd.avg_priority =
(cp->ppd.avg_priority * (RUNAVG_DELAY_N - 1) +
request_priority) / RUNAVG_DELAY_N;
}
-/**
- * Method called whenever a given peer has a status change.
- *
- * @param cls closure
- * @param peer peer identity this notification is about
- * @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
- */
-void
-GSF_peer_status_handler_ (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_TIME_Absolute timeout,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
-{
- struct GSF_ConnectedPeer *cp;
-
- cp = GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey);
- GNUNET_assert (NULL != cp);
- update_atsi (cp, atsi);
-}
-
-
/**
* A peer disconnected from us. Tear down the connected peer
* record.
struct GSF_PeerTransmitHandle *pth;
struct GSF_DelayedHandle *dh;
- cp = GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey);
+ cp = GSF_peer_get_ (peer);
if (NULL == cp)
return; /* must have been disconnect from core with
* 'peer' == my_id, ignore */
GNUNET_assert (GNUNET_YES ==
- GNUNET_CONTAINER_multihashmap_remove (cp_map,
- &peer->hashPubKey, cp));
+ GNUNET_CONTAINER_multipeermap_remove (cp_map,
+ peer,
+ cp));
+ GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
+ GNUNET_CONTAINER_multipeermap_size (cp_map),
+ GNUNET_NO);
+ if (NULL != cp->respect_iterate_req)
+ {
+ GNUNET_PEERSTORE_iterate_cancel (cp->respect_iterate_req);
+ cp->respect_iterate_req = NULL;
+ }
if (NULL != cp->migration_pth)
{
GSF_peer_transmit_cancel_ (cp->migration_pth);
cp->migration_pth = NULL;
}
- if (NULL != cp->irc)
+ if (NULL != cp->rc)
{
- GNUNET_CORE_peer_change_preference_cancel (cp->irc);
- cp->irc = NULL;
+ GNUNET_ATS_reserve_bandwidth_cancel (cp->rc);
+ cp->rc = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != cp->irc_delay_task)
+ if (GNUNET_SCHEDULER_NO_TASK != cp->rc_delay_task)
{
- GNUNET_SCHEDULER_cancel (cp->irc_delay_task);
- cp->irc_delay_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_SCHEDULER_cancel (cp->rc_delay_task);
+ cp->rc_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_CONTAINER_multihashmap_iterate (cp->request_map,
&cancel_pending_request, cp);
GNUNET_PEER_decrement_rcs (cp->ppd.last_p2p_replies, P2P_SUCCESS_LIST_SIZE);
memset (cp->ppd.last_p2p_replies, 0, sizeof (cp->ppd.last_p2p_replies));
GSF_push_stop_ (cp);
+ if (NULL != cp->cth)
+ {
+ GNUNET_CORE_notify_transmit_ready_cancel (cp->cth);
+ cp->cth = NULL;
+ }
+ GNUNET_assert (0 == cp->cth_in_progress);
while (NULL != (pth = cp->pth_head))
{
- if (NULL != pth->cth)
- {
- GNUNET_CORE_notify_transmit_ready_cancel (pth->cth);
- pth->cth = NULL;
- }
if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (pth->timeout_task);
pth->timeout_task = GNUNET_SCHEDULER_NO_TASK;
}
GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth);
- GNUNET_assert (0 == pth->cth_in_progress);
pth->gmc (pth->gmc_cls, 0, NULL);
GNUNET_free (pth);
}
/**
* Function that calls the callback for each peer.
*
- * @param cls the 'struct IterationContext*'
+ * @param cls the `struct IterationContext *`
* @param key identity of the peer
- * @param value the 'struct GSF_ConnectedPeer*'
- * @return GNUNET_YES to continue iteration
+ * @param value the `struct GSF_ConnectedPeer *`
+ * @return #GNUNET_YES to continue iteration
*/
static int
-call_iterator (void *cls, const GNUNET_HashCode * key, void *value)
+call_iterator (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct IterationContext *ic = cls;
struct GSF_ConnectedPeer *cp = value;
* Iterate over all connected peers.
*
* @param it function to call for each peer
- * @param it_cls closure for it
+ * @param it_cls closure for @a it
*/
void
GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it, void *it_cls)
ic.it = it;
ic.it_cls = it_cls;
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &call_iterator, &ic);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &call_iterator, &ic);
}
/**
* Obtain the identity of a connected peer.
*
- * @param cp peer to reserve bandwidth from
+ * @param cp peer to get identity of
* @param id identity to set (written to)
*/
void
}
+/**
+ * Obtain the identity of a connected peer.
+ *
+ * @param cp peer to get identity of
+ * @return reference to peer identity, valid until peer disconnects (!)
+ */
+const struct GNUNET_PeerIdentity *
+GSF_connected_peer_get_identity2_ (const struct GSF_ConnectedPeer *cp)
+{
+ GNUNET_assert (0 != cp->ppd.pid);
+ return GNUNET_PEER_resolve2 (cp->ppd.pid);
+}
+
+
/**
* Assemble a migration stop message for transmission.
*
GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining
(cp->last_migration_block));
memcpy (buf, &msm, sizeof (struct MigrationStopMessage));
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# migration stop messages sent"),
+ 1, GNUNET_NO);
return sizeof (struct MigrationStopMessage);
}
/**
* Ask a peer to stop migrating data to us until the given point
* in time.
- *
+ *
* @param cp peer to ask
* @param block_time until when to block
*/
void
GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp,
- struct GNUNET_TIME_Relative block_time)
+ struct GNUNET_TIME_Absolute block_time)
{
- if (GNUNET_TIME_absolute_get_remaining (cp->last_migration_block).rel_value >
- block_time.rel_value)
+ if (cp->last_migration_block.abs_value_us > block_time.abs_value_us)
{
-#if DEBUG_FS && 0
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Migration already blocked for another %llu ms\n",
- (unsigned long long)
- GNUNET_TIME_absolute_get_remaining
- (cp->last_migration_block).rel_value);
-#endif
+ "Migration already blocked for another %s\n",
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining
+ (cp->last_migration_block), GNUNET_YES));
return; /* already blocked */
}
-#if DEBUG_FS && 0
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking to stop migration for %llu ms\n",
- (unsigned long long) block_time.rel_value);
-#endif
- cp->last_migration_block = GNUNET_TIME_relative_to_absolute (block_time);
- if (cp->migration_pth != NULL)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (block_time),
+ GNUNET_YES));
+ cp->last_migration_block = block_time;
+ if (NULL != cp->migration_pth)
GSF_peer_transmit_cancel_ (cp->migration_pth);
- cp->migration_pth
- = GSF_peer_transmit_ (cp,
- GNUNET_SYSERR,
- UINT32_MAX,
- GNUNET_TIME_UNIT_FOREVER_REL,
- sizeof (struct MigrationStopMessage),
- &create_migration_stop_message, cp);
+ cp->migration_pth =
+ GSF_peer_transmit_ (cp, GNUNET_SYSERR, UINT32_MAX,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ sizeof (struct MigrationStopMessage),
+ &create_migration_stop_message, cp);
}
/**
- * Write host-trust information to a file - flush the buffer entry!
+ * Write peer-respect information to a file - flush the buffer entry!
*
- * @param cls closure, not used
- * @param key host identity
+ * @param cls unused
+ * @param key peer identity
* @param value the 'struct GSF_ConnectedPeer' to flush
* @return GNUNET_OK to continue iteration
*/
static int
-flush_trust (void *cls, const GNUNET_HashCode * key, void *value)
+flush_respect (void *cls, const struct GNUNET_PeerIdentity * key, void *value)
{
struct GSF_ConnectedPeer *cp = value;
- char *fn;
- uint32_t trust;
struct GNUNET_PeerIdentity pid;
- if (cp->ppd.trust == cp->disk_trust)
+ if (cp->ppd.respect == cp->disk_respect)
return GNUNET_OK; /* unchanged */
GNUNET_assert (0 != cp->ppd.pid);
GNUNET_PEER_resolve (cp->ppd.pid, &pid);
- fn = get_trust_filename (&pid);
- if (cp->ppd.trust == 0)
- {
- if ((0 != UNLINK (fn)) && (errno != ENOENT))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
- GNUNET_ERROR_TYPE_BULK, "unlink", fn);
- }
- else
- {
- trust = htonl (cp->ppd.trust);
- if (sizeof (uint32_t) == GNUNET_DISK_fn_write (fn, &trust,
- sizeof (uint32_t),
- GNUNET_DISK_PERM_USER_READ |
- GNUNET_DISK_PERM_USER_WRITE |
- GNUNET_DISK_PERM_GROUP_READ |
- GNUNET_DISK_PERM_OTHER_READ))
- cp->disk_trust = cp->ppd.trust;
- }
- GNUNET_free (fn);
+ GNUNET_PEERSTORE_store (peerstore, "fs", &pid, "respect", &cp->ppd.respect,
+ sizeof (cp->ppd.respect),
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_PEERSTORE_STOREOPTION_REPLACE, NULL, NULL);
return GNUNET_OK;
}
/**
- * Call this method periodically to flush trust information to disk.
+ * Call this method periodically to flush respect information to disk.
*
* @param cls closure, not used
* @param tc task context, not used
*/
static void
-cron_flush_trust (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cron_flush_respect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (NULL == cp_map)
return;
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &flush_trust, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &flush_respect, NULL);
if (NULL == tc)
return;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
- GNUNET_SCHEDULER_add_delayed (TRUST_FLUSH_FREQ, &cron_flush_trust, NULL);
+ GNUNET_SCHEDULER_add_delayed_with_priority (RESPECT_FLUSH_FREQ,
+ GNUNET_SCHEDULER_PRIORITY_HIGH,
+ &cron_flush_respect, NULL);
}
void
GSF_connected_peer_init_ ()
{
- cp_map = GNUNET_CONTAINER_multihashmap_create (128);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (GSF_cfg,
- "fs",
- "TRUST",
- &trustDirectory));
- GNUNET_DISK_directory_create (trustDirectory);
+ cp_map = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
+ peerstore = GNUNET_PEERSTORE_connect (GSF_cfg);
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_trust, NULL);
+ &cron_flush_respect, NULL);
}
* @param cls closure, unused
* @param key current key code
* @param value value in the hash map (peer entry)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
-clean_peer (void *cls, const GNUNET_HashCode * key, void *value)
+clean_peer (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
- GSF_peer_disconnect_handler_ (NULL, (const struct GNUNET_PeerIdentity *) key);
+ GSF_peer_disconnect_handler_ (NULL, key);
return GNUNET_YES;
}
void
GSF_connected_peer_done_ ()
{
- cron_flush_trust (NULL, NULL);
- GNUNET_CONTAINER_multihashmap_iterate (cp_map, &clean_peer, NULL);
- GNUNET_CONTAINER_multihashmap_destroy (cp_map);
+ cron_flush_respect (NULL, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_peer, NULL);
+ GNUNET_CONTAINER_multipeermap_destroy (cp_map);
cp_map = NULL;
- GNUNET_free (trustDirectory);
- trustDirectory = NULL;
+ GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_YES);
}
* @param cls the 'struct GSF_LocalClient*' to look for
* @param key current key code
* @param value value in the hash map (peer entry)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
-clean_local_client (void *cls, const GNUNET_HashCode * key, void *value)
+clean_local_client (void *cls,
+ const struct GNUNET_PeerIdentity *key,
+ void *value)
{
const struct GSF_LocalClient *lc = cls;
struct GSF_ConnectedPeer *cp = value;
{
if (NULL == cp_map)
return; /* already cleaned up */
- GNUNET_CONTAINER_multihashmap_iterate (cp_map,
- &clean_local_client, (void *) lc);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_local_client,
+ (void *) lc);
}
projects / oweals / gnunet.git / blobdiff