/*
This file is part of GNUnet.
- (C) 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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'
#include "gnunet-service-fs_pe.h"
#include "gnunet-service-fs_pr.h"
#include "gnunet-service-fs_push.h"
+#include "gnunet_peerstore_service.h"
/**
/**
* 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.
/**
* Task for the delay.
*/
- GNUNET_SCHEDULER_TaskIdentifier delay_task;
+ struct GNUNET_SCHEDULER_Task *delay_task;
/**
* Size of the message.
{
/**
- * Handle to generic request.
+ * Handle to generic request (generic: from peer or local client).
*/
struct GSF_PendingRequest *pr;
/**
- * Handle to specific peer.
+ * Which specific peer issued this request?
*/
struct GSF_ConnectedPeer *cp;
/**
* Task for asynchronous stopping of this request.
*/
- GNUNET_SCHEDULER_TaskIdentifier kill_task;
+ struct GNUNET_SCHEDULER_Task *kill_task;
};
/**
* 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
/**
* 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'.
+ * Active requests from this neighbour, map of query to `struct PeerRequest`.
*/
struct GNUNET_CONTAINER_MultiHashMap *request_map;
/**
* 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;
+
+ /**
+ * Closure for @e creation_cb
+ */
+ void *creation_cb_cls;
+
+ /**
+ * Handle to the PEERSTORE iterate request for peer respect value
+ */
+ struct GNUNET_PEERSTORE_IterateContext *respect_iterate_req;
+
};
/**
- * Map from peer identities to 'struct GSF_ConnectPeer' entries.
+ * Map from peer identities to `struct GSF_ConnectPeer` entries.
*/
static struct GNUNET_CONTAINER_MultiPeerMap *cp_map;
/**
- * Where do we store respect information?
+ * Handle to peerstore service.
*/
-static char *respectDirectory;
-
+static struct GNUNET_PEERSTORE_Handle *peerstore;
/**
- * 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
+ * Task used to flush respect values to disk.
*/
-static char *
-get_respect_filename (const struct GNUNET_PeerIdentity *id)
-{
- char *fn;
-
- GNUNET_asprintf (&fn,
- "%s%s%s",
- respectDirectory,
- DIR_SEPARATOR_STR,
- GNUNET_i2s_full (id));
- return fn;
-}
+static struct GNUNET_SCHEDULER_Task *fr_task;
/**
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...) */
+ GNUNET_LOAD_value_set_decline (cp->ppd.transmission_delay,
+ latency);
}
/**
* 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)
* 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);
/**
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);
+ 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)
cp->did_reserve = GNUNET_NO;
/* reservation already done! */
pth->was_reserved = GNUNET_YES;
- cp->rc =
- GNUNET_ATS_reserve_bandwidth (GSF_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--);
/**
* 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;
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)
/**
* (re)try to reserve bandwidth from the given peer.
*
- * @param cls the 'struct GSF_ConnectedPeer' to reserve from
- * @param tc scheduler context
+ * @param cls the `struct GSF_ConnectedPeer` to reserve from
*/
static void
-retry_reservation (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+retry_reservation (void *cls)
{
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 (GSF_ats, &target, DBLOCK_SIZE,
+ 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)
* 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;
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
+ */
+static void
+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);
+ 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);
+ if (NULL != record)
+ GNUNET_PEERSTORE_iterate_cancel (cp->respect_iterate_req);
+ cp->respect_iterate_req = NULL;
+}
+
+
/**
* A peer connected to us. Setup the connected peer
* records.
*
* @param peer identity of peer that connected
- * @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 *
-GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer)
+void
+GSF_peer_connect_handler_ (const struct GNUNET_PeerIdentity *peer,
+ 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_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 (GSF_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);
+ cp->request_map = GNUNET_CONTAINER_multihashmap_create (128,
+ GNUNET_YES);
GNUNET_break (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (cp_map,
- GSF_connected_peer_get_identity2_ (cp),
+ GSF_connected_peer_get_identity2_ (cp),
cp,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
- GNUNET_STATISTICS_set (GSF_stats, gettext_noop ("# peers connected"),
+ GNUNET_STATISTICS_set (GSF_stats,
+ gettext_noop ("# peers connected"),
GNUNET_CONTAINER_multipeermap_size (cp_map),
GNUNET_NO);
- 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);
}
* 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 tc scheduler context
+ * @param cls the `struct GSF_ConnectedPeer`
*/
static void
-revive_migration (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+revive_migration (void *cls)
{
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_us)
{
* @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
- * @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,
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);
}
return GNUNET_OK;
}
/**
* 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;
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);
* 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)
+free_pending_request (struct PeerRequest *peerreq)
{
struct GSF_ConnectedPeer *cp = peerreq->cp;
+ struct GSF_PendingRequestData *prd;
- if (GNUNET_SCHEDULER_NO_TASK != peerreq->kill_task)
+ prd = GSF_pending_request_get_data_ (peerreq->pr);
+ 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);
+ 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));
+ &prd->query,
+ peerreq));
GNUNET_free (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;
- struct GSF_PendingRequestData *prd;
- prd = GSF_pending_request_get_data_ (pr);
- GSF_pending_request_cancel_ (pr, GNUNET_NO);
- free_pending_request (peerreq, &prd->query);
+ free_pending_request (peerreq);
+ GSF_pending_request_cancel_ (pr,
+ GNUNET_NO);
return GNUNET_OK;
}
* Free the given request.
*
* @param cls the request to free
- * @param tc task context
*/
static void
-peer_request_destroy (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+peer_request_destroy (void *cls)
{
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);
+ cancel_pending_request (NULL,
+ &prd->query,
+ peerreq);
}
/**
* The artificial delay is over, transmit the message now.
*
- * @param cls the 'struct GSF_DelayedHandle' with the message
- * @param tc scheduler context
+ * @param cls the `struct GSF_DelayedHandle` with the message
*/
static void
-transmit_delayed_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+transmit_delayed_now (void *cls)
{
struct GSF_DelayedHandle *dh = cls;
struct GSF_ConnectedPeer *cp = dh->cp;
- GNUNET_CONTAINER_DLL_remove (cp->delayed_head, cp->delayed_tail, dh);
- 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);
+ GNUNET_CONTAINER_DLL_remove (cp->delayed_head,
+ cp->delayed_tail,
+ dh);
+ cp->delay_queue_size--;
+ (void) GSF_peer_transmit_ (cp,
+ GNUNET_NO,
+ UINT32_MAX,
+ REPLY_TIMEOUT,
+ dh->msize,
+ ©_reply,
+ dh->pm);
GNUNET_free (dh);
}
* 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;
prd = GSF_pending_request_get_data_ (pr);
if (NULL == data)
{
- free_pending_request (peerreq, &prd->query);
+ free_pending_request (peerreq);
return;
}
GNUNET_break (GNUNET_BLOCK_TYPE_ANY != type);
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->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
("# P2P searches destroyed due to ultimate reply"),
- 1, GNUNET_NO);
+ 1,
+ GNUNET_NO);
peerreq->kill_task =
- GNUNET_SCHEDULER_add_now (&peer_request_destroy, peerreq);
+ GNUNET_SCHEDULER_add_now (&peer_request_destroy,
+ peerreq);
}
}
* @return effective priority
*/
static int32_t
-bound_priority (uint32_t prio_in, struct GSF_ConnectedPeer *cp)
+bound_priority (uint32_t prio_in,
+ struct GSF_ConnectedPeer *cp)
{
#define N ((double)128.0)
uint32_t ret;
*
* @param ttl_in requested ttl
* @param prio given priority
- * @return ttl_in if ttl_in is below the limit,
- * otherwise the ttl-limit for the given priority
+ * @return @a ttl_in if @a ttl_in is below the limit,
+ * otherwise the ttl-limit for the given @a prio
*/
static int32_t
-bound_ttl (int32_t ttl_in, uint32_t prio)
+bound_ttl (int32_t ttl_in,
+ uint32_t prio)
{
unsigned long long allowed;
}
+/**
+ * Closure for #test_exist_cb().
+ */
+struct TestExistClosure
+{
+
+ /**
+ * Priority of the incoming request.
+ */
+ int32_t priority;
+
+ /**
+ * Relative TTL of the incoming request.
+ */
+ int32_t ttl;
+
+ /**
+ * Type of the incoming request.
+ */
+ enum GNUNET_BLOCK_Type type;
+
+ /**
+ * Set to #GNUNET_YES if we are done handling the query.
+ */
+ int finished;
+
+};
+
+
+/**
+ * Test if the query already exists. If so, merge it, otherwise
+ * keep `finished` at #GNUNET_NO.
+ *
+ * @param cls our `struct TestExistClosure`
+ * @param hc the key of the query
+ * @param value the existing `struct PeerRequest`.
+ * @return #GNUNET_YES to continue to iterate,
+ * #GNUNET_NO if we successfully merged
+ */
+static int
+test_exist_cb (void *cls,
+ const struct GNUNET_HashCode *hc,
+ void *value)
+{
+ struct TestExistClosure *tec = cls;
+ struct PeerRequest *peerreq = value;
+ struct GSF_PendingRequest *pr;
+ struct GSF_PendingRequestData *prd;
+
+ pr = peerreq->pr;
+ prd = GSF_pending_request_get_data_ (pr);
+ if (prd->type != tec->type)
+ return GNUNET_YES;
+ if (prd->ttl.abs_value_us >=
+ GNUNET_TIME_absolute_get ().abs_value_us + tec->ttl * 1000LL)
+ {
+ /* existing request has higher TTL, drop new one! */
+ prd->priority += tec->priority;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Have existing request with higher TTL, dropping new request.\n");
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# requests dropped due to higher-TTL request"),
+ 1, GNUNET_NO);
+ tec->finished = GNUNET_YES;
+ return GNUNET_NO;
+ }
+ /* existing request has lower TTL, drop old one! */
+ tec->priority += prd->priority;
+ free_pending_request (peerreq);
+ GSF_pending_request_cancel_ (pr,
+ GNUNET_YES);
+ return GNUNET_NO;
+}
+
+
/**
* Handle P2P "QUERY" message. Creates the pending request entry
* and sets up all of the data structures to that we will
{
struct PeerRequest *peerreq;
struct GSF_PendingRequest *pr;
- struct GSF_PendingRequestData *prd;
struct GSF_ConnectedPeer *cp;
struct GSF_ConnectedPeer *cps;
const struct GNUNET_PeerIdentity *target;
uint32_t bm;
size_t bfsize;
uint32_t ttl_decrement;
- int32_t priority;
- int32_t ttl;
- enum GNUNET_BLOCK_Type type;
+ struct TestExistClosure tec;
GNUNET_PEER_Id spid;
+ const struct GSF_PendingRequestData *prd;
- GNUNET_assert (other != NULL);
msize = ntohs (message->size);
if (msize < sizeof (struct GetMessage))
{
}
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);
+ tec.type = ntohl (gm->type);
bm = ntohl (gm->hash_bitmap);
bits = 0;
while (bm > 0)
{
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",
+ "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);
- if (priority < 0)
+ tec.priority = bound_priority (ntohl (gm->priority),
+ cps);
+ if (tec.priority < 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Dropping query from `%s', this peer is too busy.\n",
return NULL;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received request for `%s' of type %u from peer `%4s' with flags %u\n",
+ "Received request for `%s' of type %u from peer `%s' with flags %u\n",
GNUNET_h2s (&gm->query),
- (unsigned int) type,
+ (unsigned int) tec.type,
GNUNET_i2s (other),
(unsigned int) bm);
target =
(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))
+ if ((GNUNET_LOAD_get_load (cp->ppd.transmission_delay) > 3 * (1 + tec.priority))
|| (GNUNET_LOAD_get_average (cp->ppd.transmission_delay) >
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,
* so at best indirect the query */
- priority = 0;
+ tec.priority = 0;
options |= GSF_PRO_FORWARD_ONLY;
spid = GNUNET_PEER_intern (other);
GNUNET_assert (0 != spid);
}
- ttl = bound_ttl (ntohl (gm->ttl), priority);
+ tec.ttl = bound_ttl (ntohl (gm->ttl),
+ tec.priority);
/* decrement ttl (always) */
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 ((tec.ttl < 0) && (((int32_t) (tec.ttl - ttl_decrement)) > 0))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Dropping query from `%s' due to TTL underflow (%d - %u).\n",
- GNUNET_i2s (other), ttl, ttl_decrement);
+ GNUNET_i2s (other),
+ tec.ttl,
+ ttl_decrement);
GNUNET_STATISTICS_update (GSF_stats,
gettext_noop
("# requests dropped due TTL underflow"), 1,
/* integer underflow => drop (should be very rare)! */
return NULL;
}
- ttl -= ttl_decrement;
+ tec.ttl -= ttl_decrement;
/* test if the request already exists */
- peerreq = GNUNET_CONTAINER_multihashmap_get (cp->request_map, &gm->query);
- if (peerreq != NULL)
- {
- pr = peerreq->pr;
- prd = GSF_pending_request_get_data_ (pr);
- if (prd->type == type)
- {
- 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;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Have existing request with higher TTL, dropping new request.\n",
- GNUNET_i2s (other));
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop
- ("# requests dropped due to higher-TTL request"),
- 1, GNUNET_NO);
- return NULL;
- }
- /* existing request has lower TTL, drop old one! */
- priority += prd->priority;
- GSF_pending_request_cancel_ (pr, GNUNET_YES);
- free_pending_request (peerreq, &gm->query);
- }
- }
+ tec.finished = GNUNET_NO;
+ GNUNET_CONTAINER_multihashmap_get_multiple (cp->request_map,
+ &gm->query,
+ &test_exist_cb,
+ &tec);
+ if (GNUNET_YES == tec.finished)
+ return NULL; /* merged into existing request, we're done */
peerreq = GNUNET_new (struct PeerRequest);
peerreq->cp = cp;
- pr = GSF_pending_request_create_ (options, type, &gm->query,
+ pr = GSF_pending_request_create_ (options,
+ tec.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 */
- &handle_p2p_reply, peerreq);
+ (bfsize > 0)
+ ? (const char *) &opt[bits]
+ : NULL,
+ bfsize,
+ ntohl (gm->filter_mutator),
+ 1 /* anonymity */,
+ (uint32_t) tec.priority,
+ tec.ttl,
+ spid,
+ GNUNET_PEER_intern (other),
+ NULL, 0, /* replies_seen */
+ &handle_p2p_reply,
+ peerreq);
GNUNET_assert (NULL != pr);
+ prd = GSF_pending_request_get_data_ (pr);
peerreq->pr = pr;
GNUNET_break (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_put (cp->request_map, &gm->query,
+ GNUNET_CONTAINER_multihashmap_put (cp->request_map,
+ &prd->query,
peerreq,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop
- ("# P2P query messages received and processed"), 1,
+ gettext_noop ("# P2P query messages received and processed"),
+ 1,
+ GNUNET_NO);
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# P2P searches active"),
+ 1,
GNUNET_NO);
- GNUNET_STATISTICS_update (GSF_stats, gettext_noop ("# P2P searches active"),
- 1, GNUNET_NO);
return pr;
}
* Function called if there has been a timeout trying to satisfy
* a transmission request.
*
- * @param cls the 'struct GSF_PeerTransmitHandle' of the request
- * @param tc scheduler context
+ * @param cls the `struct GSF_PeerTransmitHandle` of the request
*/
static void
-peer_transmit_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+peer_transmit_timeout (void *cls)
{
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)
GNUNET_assert (0 < cp->ppd.pending_replies--);
- GNUNET_LOAD_update (cp->ppd.transmission_delay, UINT64_MAX);
+ GNUNET_LOAD_update (cp->ppd.transmission_delay,
+ UINT64_MAX);
if (NULL != cp->cth)
{
GNUNET_CORE_notify_transmit_ready_cancel (cp->cth);
* @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;
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;
}
{
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)
}
+/**
+ * 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.
* @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;
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_multipeermap_remove (cp_map,
peer,
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);
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);
+ &cancel_pending_request,
+ cp);
GNUNET_CONTAINER_multihashmap_destroy (cp->request_map);
cp->request_map = NULL;
GSF_plan_notify_peer_disconnect_ (cp);
GNUNET_LOAD_value_free (cp->ppd.transmission_delay);
- 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));
+ 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_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
{
GSF_ConnectedPeerIterator it;
/**
- * Closure for 'it'.
+ * Closure for @e it.
*/
void *it_cls;
};
* @return #GNUNET_YES to continue iteration
*/
static int
-call_iterator (void *cls, const struct GNUNET_PeerIdentity * 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;
}
* @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_multipeermap_iterate (cp_map, &call_iterator, &ic);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &call_iterator,
+ &ic);
}
/**
* 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;
}
-/**
- * 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;
- 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
* 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_respect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+cron_flush_respect (void *cls)
{
-
- if (NULL == cp_map)
- return;
- 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_with_priority (RESPECT_FLUSH_FREQ,
- GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_respect, NULL);
+ fr_task = NULL;
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &flush_respect,
+ NULL);
+ fr_task = GNUNET_SCHEDULER_add_delayed_with_priority (RESPECT_FLUSH_FREQ,
+ GNUNET_SCHEDULER_PRIORITY_HIGH,
+ &cron_flush_respect, NULL);
}
GSF_connected_peer_init_ ()
{
cp_map = GNUNET_CONTAINER_multipeermap_create (128, GNUNET_YES);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (GSF_cfg, "fs",
- "RESPECT",
- &respectDirectory));
- GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_create (respectDirectory));
- GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
- &cron_flush_respect, NULL);
+ peerstore = GNUNET_PEERSTORE_connect (GSF_cfg);
+ fr_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_HIGH,
+ &cron_flush_respect, NULL);
}
void
GSF_connected_peer_done_ ()
{
- cron_flush_respect (NULL, NULL);
- GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_peer, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &flush_respect,
+ NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &clean_peer,
+ NULL);
+ GNUNET_SCHEDULER_cancel (fr_task);
+ fr_task = NULL;
GNUNET_CONTAINER_multipeermap_destroy (cp_map);
cp_map = NULL;
- GNUNET_free (respectDirectory);
- respectDirectory = 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)