X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Fgnunet-service-fs_cp.c;h=7e5ffb45e02e495d74b83699bc63aa666e2202fa;hb=89c5d0047e261ed7e5fabb2e771123f1707e4670;hp=e389a24b2ef77cf05e0343009e9e3dd3a3faa989;hpb=e8bd1e4c796bb51ed94817c1b5f69197dbfcfcbc;p=oweals%2Fgnunet.git diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index e389a24b2..7e5ffb45e 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2011 Christian Grothoff (and other contributing authors) + Copyright (C) 2011 Christian Grothoff (and other contributing authors) GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,23 +14,23 @@ 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. */ - /** * @file fs/gnunet-service-fs_cp.c * @brief API to handle 'connected peers' * @author Christian Grothoff */ #include "platform.h" +#include "gnunet_util_lib.h" #include "gnunet_load_lib.h" -#include "gnunet_ats_service.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" /** @@ -85,7 +85,7 @@ struct GSF_PeerTransmitHandle /** * Task called on timeout, or 0 for none. */ - GNUNET_SCHEDULER_TaskIdentifier timeout_task; + struct GNUNET_SCHEDULER_Task *timeout_task; /** * Function to call to get the actual message. @@ -98,7 +98,7 @@ struct GSF_PeerTransmitHandle struct GSF_ConnectedPeer *cp; /** - * Closure for 'gmc'. + * Closure for @e gmc. */ void *gmc_cls; @@ -108,7 +108,7 @@ struct GSF_PeerTransmitHandle size_t size; /** - * 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; @@ -154,7 +154,7 @@ struct GSF_DelayedHandle /** * Task for the delay. */ - GNUNET_SCHEDULER_TaskIdentifier delay_task; + struct GNUNET_SCHEDULER_Task *delay_task; /** * Size of the message. @@ -183,7 +183,7 @@ struct PeerRequest /** * Task for asynchronous stopping of this request. */ - GNUNET_SCHEDULER_TaskIdentifier kill_task; + struct GNUNET_SCHEDULER_Task *kill_task; }; @@ -208,7 +208,7 @@ struct GSF_ConnectedPeer /** * Task scheduled to revive migration to this peer. */ - GNUNET_SCHEDULER_TaskIdentifier mig_revive_task; + struct GNUNET_SCHEDULER_Task *mig_revive_task; /** * Messages (replies, queries, content migration) we would like to @@ -247,7 +247,7 @@ struct GSF_ConnectedPeer /** * Task scheduled if we need to retry bandwidth reservation later. */ - GNUNET_SCHEDULER_TaskIdentifier rc_delay_task; + struct GNUNET_SCHEDULER_Task *rc_delay_task; /** * Active requests from this neighbour, map of query to 'struct PeerRequest'. @@ -268,114 +268,91 @@ struct GSF_ConnectedPeer /** * Set to 1 if we're currently in the process of calling - * 'GNUNET_CORE_notify_transmit_ready' (so while cth is + * #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; + /** + * Number of entries in @e delayed_head DLL. + */ + unsigned int delay_queue_size; + /** * Respect rating for this peer on disk. */ uint32_t disk_respect; /** - * Which offset in "last_p2p_replies" will be updated next? + * Which offset in @e last_p2p_replies will be updated next? * (we go round-robin). */ unsigned int last_p2p_replies_woff; /** - * Which offset in "last_client_replies" will be updated next? + * Which offset in @e last_client_replies will be updated next? * (we go round-robin). */ unsigned int last_client_replies_woff; /** - * Current offset into 'last_request_times' ring buffer. + * Current offset into @e last_request_times ring buffer. */ unsigned int last_request_times_off; /** - * GNUNET_YES if we did successfully reserve 32k bandwidth, - * GNUNET_NO if not. + * #GNUNET_YES if we did successfully reserve 32k bandwidth, + * #GNUNET_NO if not. */ int did_reserve; -}; - + /** + * Function called when the creation of this record is complete. + */ + GSF_ConnectedPeerCreationCallback creation_cb; -/** - * Map from peer identities to 'struct GSF_ConnectPeer' entries. - */ -static struct GNUNET_CONTAINER_MultiHashMap *cp_map; + /** + * Closure for @e creation_cb + */ + void *creation_cb_cls; -/** - * Where do we store respect information? - */ -static char *respectDirectory; + /** + * Handle to the PEERSTORE iterate request for peer respect value + */ + struct GNUNET_PEERSTORE_IterateContext *respect_iterate_req; -/** - * Handle to ATS service. - */ -static struct GNUNET_ATS_PerformanceHandle *ats; +}; /** - * Get the filename under which we would store respect - * for the given peer. - * - * @param id peer to get the filename for - * @return filename of the form DIRECTORY/PEERID + * Map from peer identities to `struct GSF_ConnectPeer` entries. */ -static char * -get_respect_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", respectDirectory, DIR_SEPARATOR_STR, &fil); - return fn; -} - +static struct GNUNET_CONTAINER_MultiPeerMap *cp_map; /** - * Find latency information in 'atsi'. - * - * @param atsi performance data - * @param atsi_count number of records in 'atsi' - * @return connection latency + * Handle to peerstore service. */ -static struct GNUNET_TIME_Relative -get_latency (const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count) -{ - unsigned int i; - - for (i = 0; i < atsi_count; i++) - if (ntohl (atsi->type) == GNUNET_ATS_QUALITY_NET_DELAY) - return GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, - ntohl (atsi->value)); - return GNUNET_TIME_UNIT_SECONDS; -} +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 atsi_count number of records in 'atsi' + * @param id peer record to update + * @param latency current latency value */ -static void -update_atsi (struct GSF_ConnectedPeer *cp, - const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count) +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, atsi_count); - GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay, latency); - /* LATER: merge atsi into cp's performance data (if we ever care...) */ + 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); } @@ -395,19 +372,21 @@ GSF_get_peer_performance_data_ (struct GSF_ConnectedPeer *cp) /** * Core is ready to transmit to a peer, get the message. * - * @param cls the 'struct GSF_PeerTransmitHandle' of the message + * @param cls the `struct GSF_PeerTransmitHandle` of the message * @param size number of bytes core is willing to take * @param buf where to copy the message - * @return number of bytes copied to buf + * @return number of bytes copied to @a buf */ static size_t -peer_transmit_ready_cb (void *cls, size_t size, void *buf); +peer_transmit_ready_cb (void *cls, + size_t size, + void *buf); /** * Function called by core upon success or failure of our bandwidth reservation request. * - * @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request + * @param cls the `struct GSF_ConnectedPeer` of the peer for which we made the request * @param peer identifies the peer * @param amount set to the amount that was actually reserved or unreserved; * either the full requested amount or zero (no partial reservations) @@ -415,8 +394,10 @@ peer_transmit_ready_cb (void *cls, size_t size, void *buf); * long should the client wait until re-trying? */ static void -ats_reserve_callback (void *cls, const struct GNUNET_PeerIdentity *peer, - int32_t amount, struct GNUNET_TIME_Relative res_delay); +ats_reserve_callback (void *cls, + const struct GNUNET_PeerIdentity *peer, + int32_t amount, + struct GNUNET_TIME_Relative res_delay); /** @@ -439,13 +420,16 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth) if (0 != cp->inc_preference) { - GNUNET_ATS_change_preference (ats, &target, GNUNET_ATS_PREFERENCE_BANDWIDTH, - (double) cp->inc_preference, - GNUNET_ATS_PREFERENCE_END); + 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)) + if ( (GNUNET_YES == pth->is_query) && + (GNUNET_YES != pth->was_reserved) ) { /* query, need reservation */ if (GNUNET_YES != cp->did_reserve) @@ -453,17 +437,22 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth) cp->did_reserve = GNUNET_NO; /* reservation already done! */ pth->was_reserved = GNUNET_YES; - cp->rc = - GNUNET_ATS_reserve_bandwidth (ats, &target, DBLOCK_SIZE, - &ats_reserve_callback, cp); + cp->rc = GNUNET_ATS_reserve_bandwidth (GSF_ats, + &target, + DBLOCK_SIZE, + &ats_reserve_callback, + cp); return; } GNUNET_assert (NULL == cp->cth); cp->cth_in_progress++; cp->cth = - GNUNET_CORE_notify_transmit_ready (GSF_core, GNUNET_YES, pth->priority, - GNUNET_TIME_absolute_get_remaining - (pth->timeout), &target, pth->size, + 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--); @@ -473,13 +462,15 @@ schedule_transmission (struct GSF_PeerTransmitHandle *pth) /** * Core is ready to transmit to a peer, get the message. * - * @param cls the 'struct GSF_PeerTransmitHandle' of the message + * @param cls the `struct GSF_PeerTransmitHandle` of the message * @param size number of bytes core is willing to take * @param buf where to copy the message - * @return number of bytes copied to buf + * @return number of bytes copied to @a buf */ static size_t -peer_transmit_ready_cb (void *cls, size_t size, void *buf) +peer_transmit_ready_cb (void *cls, + size_t size, + void *buf) { struct GSF_ConnectedPeer *cp = cls; struct GSF_PeerTransmitHandle *pth = cp->pth_head; @@ -494,17 +485,19 @@ peer_transmit_ready_cb (void *cls, size_t size, void *buf) schedule_transmission (pth); return 0; } - if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task) + if (NULL != pth->timeout_task) { GNUNET_SCHEDULER_cancel (pth->timeout_task); - pth->timeout_task = GNUNET_SCHEDULER_NO_TASK; + pth->timeout_task = NULL; } - GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth); + GNUNET_CONTAINER_DLL_remove (cp->pth_head, + cp->pth_tail, + pth); if (GNUNET_YES == pth->is_query) { cp->ppd.last_request_times[(cp->last_request_times_off++) % MAX_QUEUE_PER_PEER] = - GNUNET_TIME_absolute_get (); + GNUNET_TIME_absolute_get (); GNUNET_assert (0 < cp->ppd.pending_queries--); } else if (GNUNET_NO == pth->is_query) @@ -513,7 +506,7 @@ peer_transmit_ready_cb (void *cls, size_t size, void *buf) } 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); if (NULL != (pos = cp->pth_head)) { @@ -528,27 +521,30 @@ peer_transmit_ready_cb (void *cls, size_t size, void *buf) /** * (re)try to reserve bandwidth from the given peer. * - * @param cls the 'struct GSF_ConnectedPeer' to reserve from + * @param cls the `struct GSF_ConnectedPeer` to reserve from * @param tc scheduler context */ static void -retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +retry_reservation (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GSF_ConnectedPeer *cp = cls; struct GNUNET_PeerIdentity target; GNUNET_PEER_resolve (cp->ppd.pid, &target); - cp->rc_delay_task = GNUNET_SCHEDULER_NO_TASK; + cp->rc_delay_task = NULL; cp->rc = - GNUNET_ATS_reserve_bandwidth (ats, &target, DBLOCK_SIZE, - &ats_reserve_callback, cp); + GNUNET_ATS_reserve_bandwidth (GSF_ats, + &target, + DBLOCK_SIZE, + &ats_reserve_callback, cp); } /** * Function called by core upon success or failure of our bandwidth reservation request. * - * @param cls the 'struct GSF_ConnectedPeer' of the peer for which we made the request + * @param cls the `struct GSF_ConnectedPeer` of the peer for which we made the request * @param peer identifies the peer * @param amount set to the amount that was actually reserved or unreserved; * either the full requested amount or zero (no partial reservations) @@ -556,83 +552,115 @@ retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * long should the client wait until re-trying? */ static void -ats_reserve_callback (void *cls, const struct GNUNET_PeerIdentity *peer, - int32_t amount, struct GNUNET_TIME_Relative res_delay) +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; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reserved %d bytes / need to wait %s for reservation\n", - (int) amount, + (int) amount, GNUNET_STRINGS_relative_time_to_string (res_delay, GNUNET_YES)); cp->rc = NULL; if (0 == amount) { cp->rc_delay_task = - GNUNET_SCHEDULER_add_delayed (res_delay, &retry_reservation, cp); + GNUNET_SCHEDULER_add_delayed (res_delay, + &retry_reservation, + cp); return; } cp->did_reserve = GNUNET_YES; pth = cp->pth_head; - if ((NULL != pth) && (NULL == cp->cth) && (0 == cp->cth_in_progress)) + if ( (NULL != pth) && + (NULL == cp->cth) && + (0 == cp->cth_in_progress) ) { /* reservation success, try transmission now! */ cp->cth_in_progress++; cp->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, cp); + 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, + const struct GNUNET_PEERSTORE_Record *record, + const char *emsg) +{ + struct GSF_ConnectedPeer *cp = cls; + + GNUNET_assert (NULL != cp->respect_iterate_req); + 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 - * @param atsi_count number of records in 'atsi' - * @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_ATS_Information *atsi, - unsigned int atsi_count) + GSF_ConnectedPeerCreationCallback creation_cb, + void *creation_cb_cls) { struct GSF_ConnectedPeer *cp; - char *fn; - uint32_t respect; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Connected to peer %s\n", GNUNET_i2s (peer)); - cp = GNUNET_malloc (sizeof (struct GSF_ConnectedPeer)); + 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->rc = - GNUNET_ATS_reserve_bandwidth (ats, peer, DBLOCK_SIZE, + GNUNET_ATS_reserve_bandwidth (GSF_ats, peer, DBLOCK_SIZE, &ats_reserve_callback, cp); - fn = get_respect_filename (peer); - if ((GNUNET_YES == GNUNET_DISK_file_test (fn)) && - (sizeof (respect) == GNUNET_DISK_fn_read (fn, &respect, sizeof (respect)))) - cp->disk_respect = cp->ppd.respect = ntohl (respect); - GNUNET_free (fn); cp->request_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_NO); GNUNET_break (GNUNET_OK == - GNUNET_CONTAINER_multihashmap_put (cp_map, - &GSF_connected_peer_get_identity2_ (cp)->hashPubKey, + GNUNET_CONTAINER_multipeermap_put (cp_map, + GSF_connected_peer_get_identity2_ (cp), cp, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"), - GNUNET_CONTAINER_multihashmap_size (cp_map), + GNUNET_CONTAINER_multipeermap_size (cp_map), GNUNET_NO); - update_atsi (cp, atsi, atsi_count); - GSF_push_start_ (cp); - return cp; + 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); } @@ -640,18 +668,19 @@ GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer, * It may be time to re-start migrating content to this * peer. Check, and if so, restart migration. * - * @param cls the 'struct GSF_ConnectedPeer' + * @param cls the `struct GSF_ConnectedPeer` * @param tc scheduler context */ static void -revive_migration (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +revive_migration (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GSF_ConnectedPeer *cp = cls; struct GNUNET_TIME_Relative bt; - cp->mig_revive_task = GNUNET_SCHEDULER_NO_TASK; + cp->mig_revive_task = NULL; 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 = @@ -673,7 +702,7 @@ GSF_peer_get_ (const struct GNUNET_PeerIdentity *peer) { if (NULL == cp_map) return NULL; - return GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey); + return GNUNET_CONTAINER_multipeermap_get (cp_map, peer); } @@ -684,17 +713,13 @@ GSF_peer_get_ (const struct GNUNET_PeerIdentity *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 - * @param atsi_count number of records in 'atsi' - * @return GNUNET_OK to keep the connection open, - * GNUNET_SYSERR to close it (signal serious error) + * @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_ATS_Information *atsi, - unsigned int atsi_count) + const struct GNUNET_MessageHeader *message) { struct GSF_ConnectedPeer *cp; const struct MigrationStopMessage *msm; @@ -713,16 +738,17 @@ GSF_handle_p2p_migration_stop_ (void *cls, bt = GNUNET_TIME_relative_ntoh (msm->duration); GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Migration of content to peer `%s' blocked for %s\n"), - GNUNET_i2s (other), + GNUNET_i2s (other), GNUNET_STRINGS_relative_time_to_string (bt, GNUNET_YES)); cp->ppd.migration_blocked_until = GNUNET_TIME_relative_to_absolute (bt); - if (GNUNET_SCHEDULER_NO_TASK == cp->mig_revive_task) + if ( (NULL == cp->mig_revive_task) && + (NULL == cp->respect_iterate_req) ) { GSF_push_stop_ (cp); cp->mig_revive_task = - GNUNET_SCHEDULER_add_delayed (bt, &revive_migration, cp); + GNUNET_SCHEDULER_add_delayed (bt, + &revive_migration, cp); } - update_atsi (cp, atsi, atsi_count); return GNUNET_OK; } @@ -730,13 +756,15 @@ GSF_handle_p2p_migration_stop_ (void *cls, /** * Copy reply and free put message. * - * @param cls the 'struct PutMessage' - * @param buf_size number of bytes available in buf + * @param cls the `struct PutMessage` + * @param buf_size number of bytes available in @a buf * @param buf where to copy the message, NULL on error (peer disconnect) - * @return number of bytes copied to 'buf', can be 0 (without indicating an error) + * @return number of bytes copied to @a buf, can be 0 (without indicating an error) */ static size_t -copy_reply (void *cls, size_t buf_size, void *buf) +copy_reply (void *cls, + size_t buf_size, + void *buf) { struct PutMessage *pm = cls; size_t size; @@ -747,14 +775,16 @@ copy_reply (void *cls, size_t buf_size, void *buf) size = ntohs (pm->header.size); memcpy (buf, pm, size); GNUNET_STATISTICS_update (GSF_stats, - gettext_noop - ("# replies transmitted to other peers"), 1, + gettext_noop ("# replies transmitted to other peers"), + 1, GNUNET_NO); } else { size = 0; - GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# replies dropped"), 1, + GNUNET_STATISTICS_update (GSF_stats, + gettext_noop ("# replies dropped"), + 1, GNUNET_NO); } GNUNET_free (pm); @@ -774,10 +804,10 @@ free_pending_request (struct PeerRequest *peerreq, { struct GSF_ConnectedPeer *cp = peerreq->cp; - if (GNUNET_SCHEDULER_NO_TASK != peerreq->kill_task) + if (NULL != peerreq->kill_task) { GNUNET_SCHEDULER_cancel (peerreq->kill_task); - peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK; + peerreq->kill_task = NULL; } GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# P2P searches active"), -1, GNUNET_NO); @@ -793,11 +823,13 @@ free_pending_request (struct PeerRequest *peerreq, * * @param cls unused * @param query hash code of the request - * @param value the 'struct GSF_PendingRequest' - * @return GNUNET_YES (continue to iterate) + * @param value the `struct GSF_PendingRequest` + * @return #GNUNET_YES (continue to iterate) */ static int -cancel_pending_request (void *cls, const struct 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; @@ -817,13 +849,14 @@ cancel_pending_request (void *cls, const struct GNUNET_HashCode * query, void *v * @param tc task context */ static void -peer_request_destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +peer_request_destroy (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct PeerRequest *peerreq = cls; struct GSF_PendingRequest *pr = peerreq->pr; struct GSF_PendingRequestData *prd; - peerreq->kill_task = GNUNET_SCHEDULER_NO_TASK; + peerreq->kill_task = NULL; prd = GSF_pending_request_get_data_ (pr); cancel_pending_request (NULL, &prd->query, peerreq); } @@ -832,24 +865,33 @@ peer_request_destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** * The artificial delay is over, transmit the message now. * - * @param cls the 'struct GSF_DelayedHandle' with the message + * @param cls the `struct GSF_DelayedHandle` with the message * @param tc scheduler context */ static void -transmit_delayed_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +transmit_delayed_now (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GSF_DelayedHandle *dh = cls; struct GSF_ConnectedPeer *cp = dh->cp; - GNUNET_CONTAINER_DLL_remove (cp->delayed_head, cp->delayed_tail, dh); + GNUNET_CONTAINER_DLL_remove (cp->delayed_head, + cp->delayed_tail, + dh); + cp->delay_queue_size--; if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) { GNUNET_free (dh->pm); 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); } @@ -868,12 +910,12 @@ get_randomized_delay () GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, - 2 * GSF_avg_latency.rel_value + 1)); + 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; } @@ -887,22 +929,25 @@ get_randomized_delay () * and will also not be called anymore after a call signalling * expiration. * - * @param cls 'struct PeerRequest' this is an answer for + * @param cls `struct PeerRequest` this is an answer for * @param eval evaluation of the result * @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 expiration when does @a 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 + * @param data_len number of bytes in @a 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, struct GNUNET_TIME_Absolute last_transmission, - enum GNUNET_BLOCK_Type type, const void *data, + enum GNUNET_BLOCK_Type type, + const void *data, size_t data_len) { struct PeerRequest *peerreq = cls; @@ -960,28 +1005,38 @@ handle_p2p_reply (void *cls, enum GNUNET_BLOCK_EvaluationResult eval, pm->type = htonl (type); pm->expiration = GNUNET_TIME_absolute_hton (expiration); memcpy (&pm[1], data, data_len); - if ((UINT32_MAX != reply_anonymity_level) && (0 != reply_anonymity_level) && - (GNUNET_YES == GSF_enable_randomized_delays)) + 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); + GNUNET_CONTAINER_DLL_insert (cp->delayed_head, + cp->delayed_tail, + dh); + cp->delay_queue_size++; dh->delay_task = GNUNET_SCHEDULER_add_delayed (get_randomized_delay (), - &transmit_delayed_now, dh); + &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 (GNUNET_BLOCK_EVALUATION_OK_LAST != eval) return; - if (GNUNET_SCHEDULER_NO_TASK == peerreq->kill_task) + if (NULL == peerreq->kill_task) { GNUNET_STATISTICS_update (GSF_stats, gettext_noop @@ -1143,13 +1198,12 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, struct GSF_PendingRequestData *prd; struct GSF_ConnectedPeer *cp; struct GSF_ConnectedPeer *cps; - const struct GNUNET_HashCode *namespace; const struct GNUNET_PeerIdentity *target; enum GSF_PendingRequestOptions options; uint16_t msize; const struct GetMessage *gm; unsigned int bits; - const struct GNUNET_HashCode *opt; + const struct GNUNET_PeerIdentity *opt; uint32_t bm; size_t bfsize; uint32_t ttl_decrement; @@ -1158,7 +1212,6 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, enum GNUNET_BLOCK_Type type; GNUNET_PEER_Id spid; - GNUNET_assert (other != NULL); msize = ntohs (message->size); if (msize < sizeof (struct GetMessage)) { @@ -1167,7 +1220,8 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, } GNUNET_STATISTICS_update (GSF_stats, gettext_noop - ("# GET requests received (from other peers)"), 1, + ("# GET requests received (from other peers)"), + 1, GNUNET_NO); gm = (const struct GetMessage *) message; type = ntohl (gm->type); @@ -1179,13 +1233,13 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, bits++; bm >>= 1; } - if (msize < sizeof (struct GetMessage) + bits * sizeof (struct GNUNET_HashCode)) + if (msize < sizeof (struct GetMessage) + bits * sizeof (struct GNUNET_PeerIdentity)) { GNUNET_break_op (0); return NULL; } - opt = (const struct GNUNET_HashCode *) &gm[1]; - bfsize = msize - sizeof (struct GetMessage) - bits * sizeof (struct 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)) { @@ -1206,33 +1260,43 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, return NULL; } if (0 != (bm & GET_MESSAGE_BIT_RETURN_TO)) - cp = GSF_peer_get_ ((const struct GNUNET_PeerIdentity *) &opt[bits++]); + cp = GSF_peer_get_ (&opt[bits++]); else cp = cps; if (NULL == cp) { 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])); + "Failed to find RETURN-TO peer `%s' in connection set. Dropping query.\n", + GNUNET_i2s (&opt[bits - 1])); else GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Failed to find peer `%4s' in connection set. Dropping query.\n", + "Failed to find peer `%s' in connection set. Dropping query.\n", GNUNET_i2s (other)); -#if INSANE_STATISTICS GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# requests dropped due to missing reverse route"), - 1, GNUNET_NO); -#endif + 1, + GNUNET_NO); + return NULL; + } + if (cp->ppd.pending_replies + cp->delay_queue_size > MAX_QUEUE_PER_PEER) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Peer `%s' has too many replies queued already. Dropping query.\n", + GNUNET_i2s (other)); + GNUNET_STATISTICS_update (GSF_stats, + gettext_noop ("# requests dropped due to full reply queue"), + 1, + GNUNET_NO); return NULL; } /* note that we can really only check load here since otherwise * peers could find out that we are overloaded by not being * disconnected after sending us a malformed query... */ - priority = bound_priority (ntohl (gm->priority), cps); + priority = bound_priority (ntohl (gm->priority), + cps); if (priority < 0) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -1241,29 +1305,19 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, return NULL; } 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), + "Received request for `%s' of type %u from peer `%s' with flags %u\n", + GNUNET_h2s (&gm->query), + (unsigned int) type, + GNUNET_i2s (other), (unsigned int) bm); - namespace = (0 != (bm & GET_MESSAGE_BIT_SKS_NAMESPACE)) ? &opt[bits++] : NULL; - if ((GNUNET_BLOCK_TYPE_FS_SBLOCK == type) && (NULL == namespace)) - { - GNUNET_break_op (0); - return NULL; - } - if ((GNUNET_BLOCK_TYPE_FS_SBLOCK != type) && (NULL != namespace)) - { - GNUNET_break_op (0); - return NULL; - } target = (0 != - (bm & GET_MESSAGE_BIT_TRANSMIT_TO)) ? ((const struct GNUNET_PeerIdentity - *) &opt[bits++]) : NULL; + (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, @@ -1293,16 +1347,15 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, ttl -= ttl_decrement; /* test if the request already exists */ - peerreq = GNUNET_CONTAINER_multihashmap_get (cp->request_map, &gm->query); - if (peerreq != NULL) + peerreq = GNUNET_CONTAINER_multihashmap_get (cp->request_map, + &gm->query); + if (NULL != peerreq) { 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 (struct 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; @@ -1322,15 +1375,23 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, } } - 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, GNUNET_PEER_intern (other), NULL, 0, /* replies_seen */ + (bfsize > 0) + ? (const char *) &opt[bits] + : NULL, + bfsize, + ntohl (gm->filter_mutator), + 1 /* anonymity */, + (uint32_t) priority, + ttl, + spid, + GNUNET_PEER_intern (other), + NULL, 0, /* replies_seen */ &handle_p2p_reply, peerreq); GNUNET_assert (NULL != pr); peerreq->pr = pr; @@ -1352,20 +1413,23 @@ GSF_handle_p2p_query_ (const struct GNUNET_PeerIdentity *other, * 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 -peer_transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +peer_transmit_timeout (void *cls, + const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GSF_PeerTransmitHandle *pth = cls; struct GSF_ConnectedPeer *cp; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Timeout trying to transmit to other peer\n"); - pth->timeout_task = GNUNET_SCHEDULER_NO_TASK; + pth->timeout_task = NULL; cp = pth->cp; - GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth); + 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) @@ -1385,27 +1449,30 @@ peer_transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** * 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, - size_t size, GSF_GetMessageCallback gmc, void *gmc_cls) +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; @@ -1422,13 +1489,18 @@ GSF_peer_transmit_ (struct GSF_ConnectedPeer *cp, int is_query, prev = pos; pos = pos->next; } - 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; } @@ -1444,13 +1516,15 @@ GSF_peer_transmit_cancel_ (struct GSF_PeerTransmitHandle *pth) { struct GSF_ConnectedPeer *cp; - if (GNUNET_SCHEDULER_NO_TASK != pth->timeout_task) + if (NULL != pth->timeout_task) { GNUNET_SCHEDULER_cancel (pth->timeout_task); - pth->timeout_task = GNUNET_SCHEDULER_NO_TASK; + pth->timeout_task = NULL; } cp = pth->cp; - GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth); + 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) @@ -1474,9 +1548,9 @@ GSF_peer_update_performance_ (struct GSF_ConnectedPeer *cp, 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; @@ -1520,6 +1594,34 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp, } +/** + * Write peer-respect information to a file - flush the buffer entry! + * + * @param cls unused + * @param key peer identity + * @param value the `struct GSF_ConnectedPeer` to flush + * @return #GNUNET_OK to continue iteration + */ +static int +flush_respect (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) +{ + struct GSF_ConnectedPeer *cp = value; + struct GNUNET_PeerIdentity pid; + + if (cp->ppd.respect == cp->disk_respect) + return GNUNET_OK; /* unchanged */ + GNUNET_assert (0 != cp->ppd.pid); + GNUNET_PEER_resolve (cp->ppd.pid, &pid); + 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; +} + + /** * A peer disconnected from us. Tear down the connected peer * record. @@ -1528,7 +1630,8 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp, * @param peer identity of peer that connected */ void -GSF_peer_disconnect_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer) +GSF_peer_disconnect_handler_ (void *cls, + const struct GNUNET_PeerIdentity *peer) { struct GSF_ConnectedPeer *cp; struct GSF_PeerTransmitHandle *pth; @@ -1538,12 +1641,19 @@ GSF_peer_disconnect_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer) if (NULL == cp) return; /* must have been disconnect from core with * 'peer' == my_id, ignore */ + flush_respect (NULL, peer, cp); 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_multihashmap_size (cp_map), + 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); @@ -1554,10 +1664,10 @@ GSF_peer_disconnect_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer) GNUNET_ATS_reserve_bandwidth_cancel (cp->rc); cp->rc = NULL; } - if (GNUNET_SCHEDULER_NO_TASK != cp->rc_delay_task) + if (NULL != cp->rc_delay_task) { GNUNET_SCHEDULER_cancel (cp->rc_delay_task); - cp->rc_delay_task = GNUNET_SCHEDULER_NO_TASK; + cp->rc_delay_task = NULL; } GNUNET_CONTAINER_multihashmap_iterate (cp->request_map, &cancel_pending_request, cp); @@ -1576,34 +1686,45 @@ GSF_peer_disconnect_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer) GNUNET_assert (0 == cp->cth_in_progress); while (NULL != (pth = cp->pth_head)) { - if (pth->timeout_task != GNUNET_SCHEDULER_NO_TASK) + if (pth->timeout_task != NULL) { GNUNET_SCHEDULER_cancel (pth->timeout_task); - pth->timeout_task = GNUNET_SCHEDULER_NO_TASK; + pth->timeout_task = NULL; } - GNUNET_CONTAINER_DLL_remove (cp->pth_head, cp->pth_tail, pth); + 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--); pth->gmc (pth->gmc_cls, 0, NULL); GNUNET_free (pth); } while (NULL != (dh = cp->delayed_head)) { - GNUNET_CONTAINER_DLL_remove (cp->delayed_head, cp->delayed_tail, dh); + GNUNET_CONTAINER_DLL_remove (cp->delayed_head, + cp->delayed_tail, + dh); + cp->delay_queue_size--; GNUNET_SCHEDULER_cancel (dh->delay_task); GNUNET_free (dh->pm); GNUNET_free (dh); } GNUNET_PEER_change_rc (cp->ppd.pid, -1); - if (GNUNET_SCHEDULER_NO_TASK != cp->mig_revive_task) + if (NULL != cp->mig_revive_task) { GNUNET_SCHEDULER_cancel (cp->mig_revive_task); - cp->mig_revive_task = GNUNET_SCHEDULER_NO_TASK; + cp->mig_revive_task = NULL; } + GNUNET_break (0 == cp->ppd.pending_queries); + GNUNET_break (0 == cp->ppd.pending_replies); GNUNET_free (cp); } /** - * Closure for 'call_iterator'. + * Closure for #call_iterator(). */ struct IterationContext { @@ -1613,7 +1734,7 @@ struct IterationContext GSF_ConnectedPeerIterator it; /** - * Closure for 'it'. + * Closure for @e it. */ void *it_cls; }; @@ -1622,18 +1743,22 @@ struct IterationContext /** * 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 struct 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; - ic->it (ic->it_cls, (const struct GNUNET_PeerIdentity *) key, cp, &cp->ppd); + ic->it (ic->it_cls, + key, cp, + &cp->ppd); return GNUNET_YES; } @@ -1642,16 +1767,19 @@ call_iterator (void *cls, const struct GNUNET_HashCode * key, void *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) +GSF_iterate_connected_peers_ (GSF_ConnectedPeerIterator it, + void *it_cls) { struct IterationContext ic; 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); } @@ -1687,13 +1815,15 @@ GSF_connected_peer_get_identity2_ (const struct GSF_ConnectedPeer *cp) /** * Assemble a migration stop message for transmission. * - * @param cls the 'struct GSF_ConnectedPeer' to use - * @param size number of bytes we're allowed to write to buf + * @param cls the `struct GSF_ConnectedPeer` to use + * @param size number of bytes we're allowed to write to @a buf * @param buf where to copy the message - * @return number of bytes copied to buf + * @return number of bytes copied to @a buf */ static size_t -create_migration_stop_message (void *cls, size_t size, void *buf) +create_migration_stop_message (void *cls, + size_t size, + void *buf) { struct GSF_ConnectedPeer *cp = cls; struct MigrationStopMessage msm; @@ -1727,7 +1857,7 @@ void GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp, struct GNUNET_TIME_Absolute block_time) { - if (cp->last_migration_block.abs_value > block_time.abs_value) + if (cp->last_migration_block.abs_value_us > block_time.abs_value_us) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Migration already blocked for another %s\n", @@ -1735,8 +1865,9 @@ GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp, (cp->last_migration_block), GNUNET_YES)); return; /* already blocked */ } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Asking to stop migration for %llu ms\n", - (unsigned long long) GNUNET_TIME_absolute_get_remaining (block_time).rel_value); + 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); @@ -1748,49 +1879,6 @@ GSF_block_peer_migration_ (struct GSF_ConnectedPeer *cp, } -/** - * Write peer-respect information to a file - flush the buffer entry! - * - * @param cls unused - * @param key peer identity - * @param value the 'struct GSF_ConnectedPeer' to flush - * @return GNUNET_OK to continue iteration - */ -static int -flush_respect (void *cls, const struct GNUNET_HashCode * key, void *value) -{ - struct GSF_ConnectedPeer *cp = value; - char *fn; - uint32_t respect; - struct GNUNET_PeerIdentity pid; - - 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_respect_filename (&pid); - if (cp->ppd.respect == 0) - { - if ((0 != UNLINK (fn)) && (errno != ENOENT)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING | - GNUNET_ERROR_TYPE_BULK, "unlink", fn); - } - else - { - respect = htonl (cp->ppd.respect); - if (sizeof (uint32_t) == - GNUNET_DISK_fn_write (fn, &respect, 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_respect = cp->ppd.respect; - } - GNUNET_free (fn); - return GNUNET_OK; -} - - /** * Notify core about a preference we have for the given peer * (to allocate more resources towards it). The change will @@ -1815,12 +1903,13 @@ GSF_connected_peer_change_preference_ (struct GSF_ConnectedPeer *cp, * @param tc task context, not used */ static void -cron_flush_respect (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_respect, NULL); + GNUNET_CONTAINER_multipeermap_iterate (cp_map, + &flush_respect, NULL); if (NULL == tc) return; if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) @@ -1837,13 +1926,8 @@ cron_flush_respect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) void GSF_connected_peer_init_ () { - cp_map = GNUNET_CONTAINER_multihashmap_create (128, GNUNET_YES); - ats = GNUNET_ATS_performance_init (GSF_cfg, NULL, NULL); - GNUNET_assert (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_filename (GSF_cfg, "fs", - "RESPECT", - &respectDirectory)); - GNUNET_DISK_directory_create (respectDirectory); + 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_respect, NULL); } @@ -1855,12 +1939,14 @@ GSF_connected_peer_init_ () * @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 struct 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; } @@ -1872,26 +1958,26 @@ void GSF_connected_peer_done_ () { cron_flush_respect (NULL, NULL); - GNUNET_CONTAINER_multihashmap_iterate (cp_map, &clean_peer, NULL); - GNUNET_CONTAINER_multihashmap_destroy (cp_map); + GNUNET_CONTAINER_multipeermap_iterate (cp_map, + &clean_peer, NULL); + GNUNET_CONTAINER_multipeermap_destroy (cp_map); cp_map = NULL; - GNUNET_free (respectDirectory); - respectDirectory = NULL; - GNUNET_ATS_performance_done (ats); - ats = NULL; + GNUNET_PEERSTORE_disconnect (peerstore, GNUNET_YES); } /** * Iterator to remove references to LC entry. * - * @param cls the 'struct GSF_LocalClient*' to look for + * @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 struct 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; @@ -1915,7 +2001,7 @@ GSF_handle_local_client_disconnect_ (const struct GSF_LocalClient *lc) { if (NULL == cp_map) return; /* already cleaned up */ - GNUNET_CONTAINER_multihashmap_iterate (cp_map, &clean_local_client, + GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_local_client, (void *) lc); }