* @author Christian Grothoff
*
* To use:
- * - consider re-issue GSF_dht_lookup_ after non-DHT reply received
+ * - consider re-issue GSF_dht_lookup_ after non-DHT reply received
* - implement 'SUPPORT_DELAYS'
*
*/
/**
- * How quickly do we age cover traffic? At the given
+ * How quickly do we age cover traffic? At the given
* time interval, remaining cover traffic counters are
* decremented by 1/16th.
*/
double GSF_current_priorities;
/**
- * How many query messages have we received 'recently' that
+ * How many query messages have we received 'recently' that
* have not yet been claimed as cover traffic?
*/
unsigned int GSF_cover_query_count;
/**
- * How many content messages have we received 'recently' that
+ * How many content messages have we received 'recently' that
* have not yet been claimed as cover traffic?
*/
unsigned int GSF_cover_content_count;
/**
* Test if the DATABASE (GET) load on this peer is too high
* to even consider processing the query at
- * all.
- *
+ * all.
+ *
* @return GNUNET_YES if the load is too high to do anything (load high)
* GNUNET_NO to process normally (load normal)
* GNUNET_SYSERR to process for free (load low)
static int
handle_p2p_put (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi)
{
struct GSF_ConnectedPeer *cp;
{
struct GSF_PendingRequest *pr = cls;
+ if (GNUNET_YES !=
+ GSF_pending_request_test_target_ (pr,
+ peer))
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# Loopback routes suppressed"), 1,
+ GNUNET_NO);
+ return;
+ }
GSF_plan_add_ (cp, pr);
}
static int
handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi)
{
struct GSF_PendingRequest *pr;
/**
* We're done with the local lookup, now consider
* P2P processing (depending on request options and
- * result status). Also signal that we can now
+ * result status). Also signal that we can now
* receive more request information from the client.
*
* @param cls the client doing the request ('struct GNUNET_SERVER_Client')
struct GSF_PendingRequest *pr)
{
struct GSF_ConnectedPeer *cp = cls;
+ struct GNUNET_PeerIdentity pid;
+ GSF_connected_peer_get_identity_ (cp, &pid);
+ if (GNUNET_YES !=
+ GSF_pending_request_test_target_ (pr,
+ &pid))
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# Loopback routes suppressed"), 1,
+ GNUNET_NO);
+ return GNUNET_YES;
+ }
GSF_plan_add_ (cp, pr);
return GNUNET_YES;
}
*/
static void
peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi)
{
struct GSF_ConnectedPeer *cp;
* @param cls closure
* @param server handle to the server, NULL if we failed
* @param my_identity ID of this peer, NULL if we failed
- * @param publicKey public key of this peer, NULL if we failed
*/
static void
peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded
- *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
my_id = *my_identity;
}
NULL, &peer_init_handler,
&peer_connect_handler,
&GSF_peer_disconnect_handler_,
- &GSF_peer_status_handler_, NULL, GNUNET_NO,
+ NULL, GNUNET_NO,
NULL, GNUNET_NO, p2p_handlers);
if (NULL == GSF_core)
{