/*
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
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'
/**
* 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.
/**
* 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'.
*/
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;
/**
- * 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;
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);
}
/**
* 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)
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,
+ GNUNET_CORE_notify_transmit_ready (GSF_core,
+ GNUNET_YES,
GNUNET_CORE_PRIO_BACKGROUND,
- GNUNET_TIME_absolute_get_remaining
- (pth->timeout), &target, pth->size,
+ 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--);
* @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)
* @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 (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,
+ 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_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--);
}
{
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);
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)
{
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 =
* @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);
{
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);
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);
}
/**
* 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
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);
}
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
enum GNUNET_BLOCK_Type type;
GNUNET_PEER_Id spid;
- 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);
{
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);
+ priority = bound_priority (ntohl (gm->priority),
+ cps);
if (priority < 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
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,
GNUNET_i2s (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);
peerreq = GNUNET_new (struct PeerRequest);
peerreq->cp = cp;
- pr = GSF_pending_request_create_ (options, type, &gm->query,
+ 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;
* 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
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)
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.
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_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);
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);
}
}
-/**
- * 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;
-}
-
-
/**
* Notify core about a preference we have for the given peer
* (to allocate more resources towards it). The change will
* @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_multipeermap_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))
GSF_connected_peer_done_ ()
{
cron_flush_respect (NULL, NULL);
- GNUNET_CONTAINER_multipeermap_iterate (cp_map, &clean_peer, NULL);
+ GNUNET_CONTAINER_multipeermap_iterate (cp_map,
+ &clean_peer, NULL);
GNUNET_CONTAINER_multipeermap_destroy (cp_map);
cp_map = 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)
projects / oweals / gnunet.git / blobdiff