/*
This file is part of GNUnet.
- Copyright (C) 2009-2016 GNUnet e.V.
+ Copyright (C) 2009-2017 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
#define LOG_TRAFFIC(kind,...) GNUNET_log_from (kind, "dht-traffic",__VA_ARGS__)
+/**
+ * Enable slow sanity checks to debug issues.
+ */
+#define SANITY_CHECKS 1
+
/**
* How many buckets will we allow total.
*/
/**
* Hash of the identity of this peer.
*/
-static struct GNUNET_HashCode my_identity_hash;
+struct GNUNET_HashCode my_identity_hash;
/**
* Handle to CORE.
* Find the optimal bucket for this key.
*
* @param hc the hashcode to compare our identity to
- * @return the proper bucket index, or GNUNET_SYSERR
+ * @return the proper bucket index, or #GNUNET_SYSERR
* on error (same hashcode)
*/
static int
{
struct ConnectInfo *ci = value;
+ (void) cls;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multipeermap_remove (all_desired_peers,
peer,
const struct GNUNET_PeerIdentity *pid,
void *value)
{
- try_connect (pid, NULL);
+ (void) cls;
+ (void) value;
+ try_connect (pid,
+ NULL);
return GNUNET_YES;
}
}
-/**
- * Closure for #add_known_to_bloom().
- */
-struct BloomConstructorContext
-{
- /**
- * Bloom filter under construction.
- */
- struct GNUNET_CONTAINER_BloomFilter *bloom;
-
- /**
- * Mutator to use.
- */
- uint32_t bf_mutator;
-};
-
-
/**
* Add each of the peers we already know to the bloom filter of
* the request so that we don't get duplicate HELLOs.
*
- * @param cls the 'struct BloomConstructorContext'.
+ * @param cls the `struct GNUNET_BLOCK_Group`
* @param key peer identity to add to the bloom filter
* @param value value the peer information (unused)
* @return #GNUNET_YES (we should continue to iterate)
const struct GNUNET_PeerIdentity *key,
void *value)
{
- struct BloomConstructorContext *ctx = cls;
+ struct GNUNET_BLOCK_Group *bg = cls;
struct GNUNET_HashCode key_hash;
- struct GNUNET_HashCode mh;
+ (void) cls;
+ (void) value;
GNUNET_CRYPTO_hash (key,
sizeof (struct GNUNET_PeerIdentity),
&key_hash);
- GNUNET_BLOCK_mingle_hash (&key_hash,
- ctx->bf_mutator,
- &mh);
+ GNUNET_BLOCK_group_set_seen (bg,
+ &key_hash,
+ 1);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Adding known peer (%s) to bloomfilter for FIND PEER with mutation %u\n",
- GNUNET_i2s (key),
- ctx->bf_mutator);
- GNUNET_CONTAINER_bloomfilter_add (ctx->bloom,
- &mh);
+ "Adding known peer (%s) to bloomfilter for FIND PEER\n",
+ GNUNET_i2s (key));
return GNUNET_YES;
}
send_find_peer_message (void *cls)
{
struct GNUNET_TIME_Relative next_send_time;
- struct BloomConstructorContext bcc;
+ struct GNUNET_BLOCK_Group *bg;
struct GNUNET_CONTAINER_BloomFilter *peer_bf;
- find_peer_task = NULL;
+ (void) cls;
+ find_peer_task = NULL;
if (newly_found_peers > bucket_size)
{
/* If we are finding many peers already, no need to send out our request right now! */
newly_found_peers = 0;
return;
}
- bcc.bf_mutator =
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- UINT32_MAX);
- bcc.bloom =
- GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE,
- GNUNET_CONSTANTS_BLOOMFILTER_K);
+ bg = GNUNET_BLOCK_group_create (GDS_block_context,
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT32_MAX),
+ NULL,
+ 0,
+ "filter-size",
+ DHT_BLOOM_SIZE,
+ NULL);
GNUNET_CONTAINER_multipeermap_iterate (all_connected_peers,
&add_known_to_bloom,
- &bcc);
+ bg);
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop ("# FIND PEER messages initiated"),
1,
GNUNET_NO);
- peer_bf =
- GNUNET_CONTAINER_bloomfilter_init (NULL, DHT_BLOOM_SIZE,
+ peer_bf
+ = GNUNET_CONTAINER_bloomfilter_init (NULL,
+ DHT_BLOOM_SIZE,
GNUNET_CONSTANTS_BLOOMFILTER_K);
// FIXME: pass priority!?
GDS_NEIGHBOURS_handle_get (GNUNET_BLOCK_TYPE_DHT_HELLO,
- GNUNET_DHT_RO_FIND_PEER,
- FIND_PEER_REPLICATION_LEVEL, 0,
- &my_identity_hash, NULL, 0, bcc.bloom,
- bcc.bf_mutator, peer_bf);
+ GNUNET_DHT_RO_FIND_PEER | GNUNET_DHT_RO_RECORD_ROUTE,
+ FIND_PEER_REPLICATION_LEVEL,
+ 0,
+ &my_identity_hash,
+ NULL,
+ 0,
+ bg,
+ peer_bf);
GNUNET_CONTAINER_bloomfilter_free (peer_bf);
- GNUNET_CONTAINER_bloomfilter_free (bcc.bloom);
+ GNUNET_BLOCK_group_destroy (bg);
/* schedule next round */
next_send_time.rel_value_us =
DHT_MINIMUM_FIND_PEER_INTERVAL.rel_value_us +
{
struct PeerInfo *pi;
- /* Check for connect to self message */
+ (void) cls;
+ /* Check for connect to self message */
if (0 == memcmp (&my_identity,
peer,
sizeof (struct GNUNET_PeerIdentity)))
&pi->phash);
pi->peer_bucket = find_bucket (&pi->phash);
GNUNET_assert ( (pi->peer_bucket >= 0) &&
- (pi->peer_bucket < MAX_BUCKETS) );
+ ((unsigned int) pi->peer_bucket < MAX_BUCKETS) );
GNUNET_CONTAINER_DLL_insert_tail (k_buckets[pi->peer_bucket].head,
k_buckets[pi->peer_bucket].tail,
pi);
k_buckets[pi->peer_bucket].peers_size++;
closest_bucket = GNUNET_MAX (closest_bucket,
- pi->peer_bucket);
+ (unsigned int) pi->peer_bucket);
GNUNET_assert (GNUNET_OK ==
GNUNET_CONTAINER_multipeermap_put (all_connected_peers,
pi->id,
{
struct PeerInfo *to_remove = internal_cls;
+ (void) cls;
/* Check for disconnect from self message */
if (NULL == to_remove)
return;
* @return #GNUNET_YES if node location is closest,
* #GNUNET_NO otherwise.
*/
-static int
-am_closest_peer (const struct GNUNET_HashCode *key,
- const struct GNUNET_CONTAINER_BloomFilter *bloom)
+int
+GDS_am_closest_peer (const struct GNUNET_HashCode *key,
+ const struct GNUNET_CONTAINER_BloomFilter *bloom)
{
int bits;
int other_bits;
int bucket_num;
- int count;
struct PeerInfo *pos;
- if (0 == memcmp (&my_identity_hash, key, sizeof (struct GNUNET_HashCode)))
+ if (0 == memcmp (&my_identity_hash,
+ key,
+ sizeof (struct GNUNET_HashCode)))
return GNUNET_YES;
bucket_num = find_bucket (key);
GNUNET_assert (bucket_num >= 0);
bits = GNUNET_CRYPTO_hash_matching_bits (&my_identity_hash,
key);
pos = k_buckets[bucket_num].head;
- count = 0;
- while ((NULL != pos) && (count < bucket_size))
+ while (NULL != pos)
{
- if ((NULL != bloom) &&
- (GNUNET_YES ==
- GNUNET_CONTAINER_bloomfilter_test (bloom,
- &pos->phash)))
+ if ( (NULL != bloom) &&
+ (GNUNET_YES ==
+ GNUNET_CONTAINER_bloomfilter_test (bloom,
+ &pos->phash)) )
{
pos = pos->next;
continue; /* Skip already checked entries */
count = 0;
while ((pos != NULL) && (count < bucket_size))
{
- if ((bloom == NULL) ||
- (GNUNET_NO ==
- GNUNET_CONTAINER_bloomfilter_test (bloom,
- &pos->phash)))
+ if ( (NULL == bloom) ||
+ (GNUNET_NO ==
+ GNUNET_CONTAINER_bloomfilter_test (bloom,
+ &pos->phash)))
{
dist = get_distance (key,
&pos->phash);
}
if (NULL == chosen)
GNUNET_STATISTICS_update (GDS_stats,
- gettext_noop ("# Peer selection failed"), 1,
+ gettext_noop ("# Peer selection failed"),
+ 1,
GNUNET_NO);
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Selected peer `%s' in greedy routing for %s\n",
+ GNUNET_i2s (chosen->id),
+ GNUNET_h2s (key));
return chosen;
}
for (bc = 0; bc <= closest_bucket; bc++)
{
pos = k_buckets[bc].head;
- while ((pos != NULL) && (count < bucket_size))
+ while ( (NULL != pos) && (count < bucket_size) )
{
- if ((bloom != NULL) &&
- (GNUNET_YES ==
- GNUNET_CONTAINER_bloomfilter_test (bloom,
- &pos->phash)))
+ if ( (NULL != bloom) &&
+ (GNUNET_YES ==
+ GNUNET_CONTAINER_bloomfilter_test (bloom,
+ &pos->phash)) )
{
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop
continue; /* Ignore bloomfiltered peers */
}
if (0 == selected--)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Selected peer `%s' in random routing for %s\n",
+ GNUNET_i2s (pos->id),
+ GNUNET_h2s (key));
return pos;
+ }
}
}
GNUNET_break (0);
struct PeerInfo *);
for (off = 0; off < ret; off++)
{
- nxt = select_peer (key, bloom, hop_count);
+ nxt = select_peer (key,
+ bloom,
+ hop_count);
if (NULL == nxt)
break;
rtargets[off] = nxt;
"Adding myself (%s) to PUT bloomfilter for %s\n",
GNUNET_i2s (&my_identity),
GNUNET_h2s (key));
- GNUNET_CONTAINER_bloomfilter_add (bf, &my_identity_hash);
+ GNUNET_CONTAINER_bloomfilter_add (bf,
+ &my_identity_hash);
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop ("# PUT requests routed"),
1,
* @param key key for the content
* @param xquery extended query
* @param xquery_size number of bytes in @a xquery
- * @param reply_bf bloomfilter to filter duplicates
- * @param reply_bf_mutator mutator for @a reply_bf
+ * @param bg group to use for filtering replies
* @param peer_bf filter for peers not to select (again)
* @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not
*/
GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
enum GNUNET_DHT_RouteOption options,
uint32_t desired_replication_level,
- uint32_t hop_count, const struct GNUNET_HashCode * key,
- const void *xquery, size_t xquery_size,
- const struct GNUNET_CONTAINER_BloomFilter *reply_bf,
- uint32_t reply_bf_mutator,
+ uint32_t hop_count,
+ const struct GNUNET_HashCode *key,
+ const void *xquery,
+ size_t xquery_size,
+ struct GNUNET_BLOCK_Group *bg,
struct GNUNET_CONTAINER_BloomFilter *peer_bf)
{
unsigned int target_count;
- unsigned int i;
struct PeerInfo **targets;
struct PeerInfo *target;
struct GNUNET_MQ_Envelope *env;
struct PeerGetMessage *pgm;
char *xq;
size_t reply_bf_size;
+ void *reply_bf;
unsigned int skip_count;
+ uint32_t bf_nonce;
GNUNET_assert (NULL != peer_bf);
GNUNET_STATISTICS_update (GDS_stats,
GNUNET_i2s (&my_identity));
return GNUNET_NO;
}
- reply_bf_size = GNUNET_CONTAINER_bloomfilter_get_size (reply_bf);
+ if (GNUNET_OK !=
+ GNUNET_BLOCK_group_serialize (bg,
+ &bf_nonce,
+ &reply_bf,
+ &reply_bf_size))
+ {
+ reply_bf = NULL;
+ reply_bf_size = 0;
+ bf_nonce = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT32_MAX);
+ }
msize = xquery_size + reply_bf_size;
- if (msize + sizeof (struct PeerGetMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ if (msize + sizeof (struct PeerGetMessage) >= GNUNET_MAX_MESSAGE_SIZE)
{
GNUNET_break (0);
+ GNUNET_free_non_null (reply_bf);
GNUNET_free (targets);
return GNUNET_NO;
}
GNUNET_NO);
/* forward request */
skip_count = 0;
- for (i = 0; i < target_count; i++)
+ for (unsigned int i = 0; i < target_count; i++)
{
target = targets[i];
if (GNUNET_MQ_get_length (target->mq) >= MAXIMUM_PENDING_PER_PEER)
pgm->hop_count = htonl (hop_count + 1);
pgm->desired_replication_level = htonl (desired_replication_level);
pgm->xquery_size = htonl (xquery_size);
- pgm->bf_mutator = reply_bf_mutator;
+ pgm->bf_mutator = bf_nonce;
GNUNET_break (GNUNET_YES ==
GNUNET_CONTAINER_bloomfilter_test (peer_bf,
&target->phash));
GNUNET_memcpy (xq,
xquery,
xquery_size);
- if (NULL != reply_bf)
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_bloomfilter_get_raw_data (reply_bf,
- &xq
- [xquery_size],
- reply_bf_size));
+ GNUNET_memcpy (&xq[xquery_size],
+ reply_bf,
+ reply_bf_size);
GNUNET_MQ_send (target->mq,
env);
}
GNUNET_free (targets);
+ GNUNET_free_non_null (reply_bf);
return (skip_count < target_count) ? GNUNET_OK : GNUNET_NO;
}
msize = data_size + (get_path_length + put_path_length) *
sizeof (struct GNUNET_PeerIdentity);
- if ((msize + sizeof (struct PeerResultMessage) >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ if ((msize + sizeof (struct PeerResultMessage) >= GNUNET_MAX_MESSAGE_SIZE) ||
(get_path_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
+ GNUNET_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
(put_path_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
- (data_size > GNUNET_SERVER_MAX_MESSAGE_SIZE))
+ GNUNET_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
+ (data_size > GNUNET_MAX_MESSAGE_SIZE))
{
GNUNET_break (0);
return;
core_init (void *cls,
const struct GNUNET_PeerIdentity *identity)
{
+ (void) cls;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"CORE called, I am %s\n",
GNUNET_i2s (identity));
uint32_t putlen;
uint16_t msize;
+ (void) cls;
msize = ntohs (put->header.size);
putlen = ntohl (put->put_path_length);
if ((msize <
sizeof (struct PeerPutMessage) +
putlen * sizeof (struct GNUNET_PeerIdentity)) ||
(putlen >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+ GNUNET_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
struct GNUNET_CONTAINER_BloomFilter *bf;
struct GNUNET_HashCode test_key;
int forwarded;
+ struct GNUNET_TIME_Absolute exp_time;
+ exp_time = GNUNET_TIME_absolute_ntoh (put->expiration_time);
+ if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us)
+ {
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Expired PUTs discarded"),
+ 1,
+ GNUNET_NO);
+ return;
+ }
msize = ntohs (put->header.size);
putlen = ntohl (put->put_path_length);
GNUNET_STATISTICS_update (GDS_stats,
if (GNUNET_YES == log_route_details_stderr)
{
char *tmp;
+ char *pp;
+ pp = GNUNET_STRINGS_pp2s (put_path,
+ putlen);
tmp = GNUNET_strdup (GNUNET_i2s (&my_identity));
LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG,
- "R5N PUT %s: %s->%s (%u, %u=>%u)\n",
+ "R5N PUT %s: %s->%s (%u, %u=>%u, PP: %s)\n",
GNUNET_h2s (&put->key),
GNUNET_i2s (peer->id),
tmp,
GNUNET_CRYPTO_hash_matching_bits (&peer->phash,
&put->key),
GNUNET_CRYPTO_hash_matching_bits (&my_identity_hash,
- &put->key)
- );
+ &put->key),
+ pp);
+ GNUNET_free (pp);
GNUNET_free (tmp);
}
switch (GNUNET_BLOCK_get_key
{
switch (GNUNET_BLOCK_evaluate (GDS_block_context,
ntohl (put->type),
+ NULL, /* query group */
GNUNET_BLOCK_EO_NONE,
NULL, /* query */
- NULL, 0, /* bloom filer */
NULL, 0, /* xquery */
- payload, payload_size))
+ payload,
+ payload_size))
{
case GNUNET_BLOCK_EVALUATION_OK_MORE:
case GNUNET_BLOCK_EVALUATION_OK_LAST:
/* extend 'put path' by sender */
if (0 != (options & GNUNET_DHT_RO_RECORD_ROUTE))
{
+#if SANITY_CHECKS
+ for (unsigned int i=0;i<=putlen;i++)
+ {
+ for (unsigned int j=0;j<i;j++)
+ {
+ GNUNET_break (0 != memcmp (&pp[i],
+ &pp[j],
+ sizeof (struct GNUNET_PeerIdentity)));
+ }
+ GNUNET_break (0 != memcmp (&pp[i],
+ peer->id,
+ sizeof (struct GNUNET_PeerIdentity)));
+ }
+#endif
GNUNET_memcpy (pp,
put_path,
putlen * sizeof (struct GNUNET_PeerIdentity));
putlen = 0;
/* give to local clients */
- GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (put->expiration_time),
+ GDS_CLIENTS_handle_reply (exp_time,
&put->key,
0,
NULL,
payload);
/* store locally */
if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
- (am_closest_peer (&put->key, bf)))
- GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (put->expiration_time),
+ (GDS_am_closest_peer (&put->key, bf)))
+ GDS_DATACACHE_handle_put (exp_time,
&put->key,
putlen,
pp,
forwarded = GDS_NEIGHBOURS_handle_put (ntohl (put->type),
options,
ntohl (put->desired_replication_level),
- GNUNET_TIME_absolute_ntoh (put->expiration_time),
+ exp_time,
ntohl (put->hop_count),
bf,
&put->key,
ntohl (put->hop_count),
ntohl (put->desired_replication_level),
putlen, pp,
- GNUNET_TIME_absolute_ntoh (put->expiration_time),
+ exp_time,
&put->key,
payload,
payload_size);
*
* @param sender sender of the FIND PEER request
* @param key peers close to this key are desired
- * @param bf peers matching this bf are excluded
- * @param bf_mutator mutator for bf
+ * @param bg group for filtering peers
*/
static void
handle_find_peer (const struct GNUNET_PeerIdentity *sender,
const struct GNUNET_HashCode *key,
- struct GNUNET_CONTAINER_BloomFilter *bf,
- uint32_t bf_mutator)
+ struct GNUNET_BLOCK_Group *bg)
{
int bucket_idx;
struct PeerBucket *bucket;
struct PeerInfo *peer;
unsigned int choice;
- struct GNUNET_HashCode mhash;
const struct GNUNET_HELLO_Message *hello;
+ size_t hello_size;
/* first, check about our own HELLO */
if (NULL != GDS_my_hello)
{
- GNUNET_BLOCK_mingle_hash (&my_identity_hash, bf_mutator, &mhash);
- if ((NULL == bf) ||
- (GNUNET_YES != GNUNET_CONTAINER_bloomfilter_test (bf, &mhash)))
+ hello_size = GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message *) GDS_my_hello);
+ GNUNET_break (hello_size >= sizeof (struct GNUNET_MessageHeader));
+ if (GNUNET_BLOCK_EVALUATION_OK_MORE ==
+ GNUNET_BLOCK_evaluate (GDS_block_context,
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ bg,
+ GNUNET_BLOCK_EO_LOCAL_SKIP_CRYPTO,
+ &my_identity_hash,
+ NULL, 0,
+ GDS_my_hello,
+ hello_size))
{
GDS_NEIGHBOURS_handle_reply (sender,
GNUNET_BLOCK_TYPE_DHT_HELLO,
- GNUNET_TIME_relative_to_absolute
- (hello_expiration),
+ GNUNET_TIME_relative_to_absolute (hello_expiration),
key,
0,
NULL,
0,
NULL,
GDS_my_hello,
- GNUNET_HELLO_size ((const struct
- GNUNET_HELLO_Message *)
- GDS_my_hello));
+ hello_size);
}
else
{
sizeof (struct GNUNET_HashCode)))
bucket_idx = closest_bucket;
else
- bucket_idx = GNUNET_MIN (closest_bucket,
+ bucket_idx = GNUNET_MIN ((int) closest_bucket,
find_bucket (key));
- if (bucket_idx == GNUNET_SYSERR)
+ if (bucket_idx < 0)
return;
bucket = &k_buckets[bucket_idx];
if (bucket->peers_size == 0)
do
{
peer = peer->next;
- if (choice-- == 0)
+ if (0 == choice--)
return; /* no non-masked peer available */
if (NULL == peer)
peer = bucket->head;
- GNUNET_BLOCK_mingle_hash (&peer->phash,
- bf_mutator,
- &mhash);
hello = GDS_HELLO_get (peer->id);
- } while ( (hello == NULL) ||
- (GNUNET_YES ==
- GNUNET_CONTAINER_bloomfilter_test (bf,
- &mhash)) );
+ } while ( (NULL == hello) ||
+ (GNUNET_BLOCK_EVALUATION_OK_MORE !=
+ GNUNET_BLOCK_evaluate (GDS_block_context,
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ bg,
+ GNUNET_BLOCK_EO_LOCAL_SKIP_CRYPTO,
+ &peer->phash,
+ NULL, 0,
+ hello,
+ (hello_size = GNUNET_HELLO_size (hello)))) );
GDS_NEIGHBOURS_handle_reply (sender,
GNUNET_BLOCK_TYPE_DHT_HELLO,
GNUNET_TIME_relative_to_absolute
0,
NULL,
hello,
- GNUNET_HELLO_size (hello));
+ hello_size);
}
/**
* Handle a result from local datacache for a GET operation.
*
- * @param cls the `struct ClientHandle` of the client doing the query
+ * @param cls the `struct PeerInfo` for which this is a reply
* @param type type of the block
* @param expiration_time when does the content expire
* @param key key for the content
const void *data,
size_t data_size)
{
- // FIXME: we can probably do better here by
- // passing the peer that did the query in the closure...
- GDS_ROUTING_process (NULL,
- type,
- expiration_time,
- key,
- put_path_length, put_path,
- 0, NULL,
- data, data_size);
+ struct PeerInfo *peer = cls;
+ char *pp;
+
+ pp = GNUNET_STRINGS_pp2s (put_path,
+ put_path_length);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found local result for %s (PP: %s)\n",
+ GNUNET_h2s (key),
+ pp);
+ GNUNET_free (pp);
+ GDS_NEIGHBOURS_handle_reply (peer->id,
+ type,
+ expiration_time,
+ key,
+ put_path_length, put_path,
+ get_path_length, get_path,
+ data, data_size);
}
uint32_t xquery_size;
uint16_t msize;
+ (void) cls;
msize = ntohs (get->header.size);
xquery_size = ntohl (get->xquery_size);
if (msize < sizeof (struct PeerGetMessage) + xquery_size)
enum GNUNET_BLOCK_Type type;
enum GNUNET_DHT_RouteOption options;
enum GNUNET_BLOCK_EvaluationResult eval;
- struct GNUNET_CONTAINER_BloomFilter *reply_bf;
+ struct GNUNET_BLOCK_Group *bg;
struct GNUNET_CONTAINER_BloomFilter *peer_bf;
const char *xquery;
int forwarded;
- if (NULL == peer)
- {
- GNUNET_break (0);
- return;
- }
/* parse and validate message */
msize = ntohs (get->header.size);
xquery_size = ntohl (get->xquery_size);
type = ntohl (get->type);
options = ntohl (get->options);
xquery = (const char *) &get[1];
- reply_bf = NULL;
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop ("# P2P GET requests received"),
1,
xquery);
GNUNET_free (tmp);
}
-
- if (reply_bf_size > 0)
- reply_bf =
- GNUNET_CONTAINER_bloomfilter_init (&xquery[xquery_size],
- reply_bf_size,
- GNUNET_CONSTANTS_BLOOMFILTER_K);
- eval =
- GNUNET_BLOCK_evaluate (GDS_block_context,
+ eval
+ = GNUNET_BLOCK_evaluate (GDS_block_context,
type,
+ NULL,
GNUNET_BLOCK_EO_NONE,
&get->key,
- &reply_bf,
- get->bf_mutator,
xquery,
xquery_size,
NULL,
{
/* request invalid or block type not supported */
GNUNET_break_op (eval == GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED);
- if (NULL != reply_bf)
- GNUNET_CONTAINER_bloomfilter_free (reply_bf);
return;
}
peer_bf = GNUNET_CONTAINER_bloomfilter_init (get->bloomfilter,
GNUNET_break_op (GNUNET_YES ==
GNUNET_CONTAINER_bloomfilter_test (peer_bf,
&peer->phash));
- /* remember request for routing replies */
- GDS_ROUTING_add (peer->id,
- type,
- options,
- &get->key,
- xquery,
- xquery_size,
- reply_bf,
- get->bf_mutator);
+ bg = GNUNET_BLOCK_group_create (GDS_block_context,
+ type,
+ get->bf_mutator,
+ &xquery[xquery_size],
+ reply_bf_size,
+ "filter-size",
+ reply_bf_size,
+ NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GET for %s at %s after %u hops\n",
GNUNET_h2s (&get->key),
(unsigned int) ntohl (get->hop_count));
/* local lookup (this may update the reply_bf) */
if ((0 != (options & GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE)) ||
- (am_closest_peer (&get->key,
+ (GDS_am_closest_peer (&get->key,
peer_bf)))
{
if ((0 != (options & GNUNET_DHT_RO_FIND_PEER)))
GNUNET_NO);
handle_find_peer (peer->id,
&get->key,
- reply_bf,
- get->bf_mutator);
+ bg);
}
else
{
type,
xquery,
xquery_size,
- &reply_bf,
- get->bf_mutator,
+ bg,
&handle_local_result,
- NULL);
+ peer);
}
}
else
GNUNET_NO);
}
+ /* remember request for routing replies */
+ GDS_ROUTING_add (peer->id,
+ type,
+ bg, /* bg now owned by routing, but valid at least until end of this function! */
+ options,
+ &get->key,
+ xquery,
+ xquery_size);
+
/* P2P forwarding */
forwarded = GNUNET_NO;
if (eval != GNUNET_BLOCK_EVALUATION_OK_LAST)
&get->key,
xquery,
xquery_size,
- reply_bf,
- get->bf_mutator,
+ bg,
peer_bf);
GDS_CLIENTS_process_get (options
| (GNUNET_OK == forwarded)
NULL,
&get->key);
-
- /* clean up */
- if (NULL != reply_bf)
- GNUNET_CONTAINER_bloomfilter_free (reply_bf);
+ /* clean up; note that 'bg' is owned by routing now! */
GNUNET_CONTAINER_bloomfilter_free (peer_bf);
}
uint32_t put_path_length;
uint16_t msize;
+ (void) cls;
msize = ntohs (prm->header.size);
put_path_length = ntohl (prm->put_path_length);
get_path_length = ntohl (prm->get_path_length);
put_path_length) *
sizeof (struct GNUNET_PeerIdentity)) ||
(get_path_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
+ GNUNET_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)) ||
(put_path_length >
- GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
+ GNUNET_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break_op (0);
return GNUNET_SYSERR;
}
+/**
+ * Process a reply, after the @a get_path has been updated.
+ *
+ * @param expiration_time when does the reply expire
+ * @param key key matching the query
+ * @param get_path_length number of entries in @a get_path
+ * @param get_path path the reply has taken
+ * @param put_path_length number of entries in @a put_path
+ * @param put_path path the PUT has taken
+ * @param type type of the block
+ * @param data_size number of bytes in @a data
+ * @param data payload of the reply
+ */
+static void
+process_reply_with_path (struct GNUNET_TIME_Absolute expiration_time,
+ const struct GNUNET_HashCode *key,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int put_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ enum GNUNET_BLOCK_Type type,
+ size_t data_size,
+ const void *data)
+{
+ /* forward to local clients */
+ GDS_CLIENTS_handle_reply (expiration_time,
+ key,
+ get_path_length,
+ get_path,
+ put_path_length,
+ put_path,
+ type,
+ data_size,
+ data);
+ GDS_CLIENTS_process_get_resp (type,
+ get_path,
+ get_path_length,
+ put_path,
+ put_path_length,
+ expiration_time,
+ key,
+ data,
+ data_size);
+ if (GNUNET_YES == cache_results)
+ {
+ struct GNUNET_PeerIdentity xput_path[get_path_length + 1 + put_path_length];
+
+ GNUNET_memcpy (xput_path,
+ put_path,
+ put_path_length * sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_memcpy (&xput_path[put_path_length],
+ get_path,
+ get_path_length * sizeof (struct GNUNET_PeerIdentity));
+
+ GDS_DATACACHE_handle_put (expiration_time,
+ key,
+ get_path_length + put_path_length,
+ xput_path,
+ type,
+ data_size,
+ data);
+ }
+ /* forward to other peers */
+ GDS_ROUTING_process (type,
+ expiration_time,
+ key,
+ put_path_length,
+ put_path,
+ get_path_length,
+ get_path,
+ data,
+ data_size);
+}
+
+
/**
* Core handler for p2p result messages.
*
uint16_t msize;
size_t data_size;
enum GNUNET_BLOCK_Type type;
+ struct GNUNET_TIME_Absolute exp_time;
/* parse and validate message */
+ exp_time = GNUNET_TIME_absolute_ntoh (prm->expiration_time);
+ if (0 == GNUNET_TIME_absolute_get_remaining (exp_time).rel_value_us)
+ {
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Expired results discarded"),
+ 1,
+ GNUNET_NO);
+ return;
+ }
msize = ntohs (prm->header.size);
put_path_length = ntohl (prm->put_path_length);
get_path_length = ntohl (prm->get_path_length);
if (GNUNET_YES == log_route_details_stderr)
{
char *tmp;
+ char *pp;
+ char *gp;
+ gp = GNUNET_STRINGS_pp2s (get_path,
+ get_path_length);
+ pp = GNUNET_STRINGS_pp2s (put_path,
+ put_path_length);
tmp = GNUNET_strdup (GNUNET_i2s (&my_identity));
LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG,
- "R5N RESULT %s: %s->%s (%u)\n",
+ "R5N RESULT %s: %s->%s (GP: %s, PP: %s)\n",
GNUNET_h2s (&prm->key),
GNUNET_i2s (peer->id),
tmp,
- get_path_length + 1);
+ gp,
+ pp);
+ GNUNET_free (gp);
+ GNUNET_free (pp);
GNUNET_free (tmp);
}
/* if we got a HELLO, consider it for our own routing table */
h);
}
- /* append 'peer' to 'get_path' */
+ /* First, check if 'peer' is already on the path, and if
+ so, truncate it instead of expanding. */
+ for (unsigned int i=0;i<=get_path_length;i++)
+ if (0 == memcmp (&get_path[i],
+ peer->id,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ process_reply_with_path (exp_time,
+ &prm->key,
+ i,
+ get_path,
+ put_path_length,
+ put_path,
+ type,
+ data_size,
+ data);
+ return;
+ }
+
+ /* Need to append 'peer' to 'get_path' (normal case) */
{
struct GNUNET_PeerIdentity xget_path[get_path_length + 1];
get_path,
get_path_length * sizeof (struct GNUNET_PeerIdentity));
xget_path[get_path_length] = *peer->id;
- get_path_length++;
-
- /* forward to local clients */
- GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (prm->expiration_time),
- &prm->key,
- get_path_length,
- xget_path,
- put_path_length,
- put_path,
- type,
- data_size,
- data);
- GDS_CLIENTS_process_get_resp (type,
- xget_path,
- get_path_length,
- put_path, put_path_length,
- GNUNET_TIME_absolute_ntoh (prm->expiration_time),
- &prm->key,
- data,
- data_size);
- if (GNUNET_YES == cache_results)
- {
- struct GNUNET_PeerIdentity xput_path[get_path_length + 1 + put_path_length];
- GNUNET_memcpy (xput_path,
- put_path,
- put_path_length * sizeof (struct GNUNET_PeerIdentity));
- GNUNET_memcpy (&xput_path[put_path_length],
- xget_path,
- get_path_length * sizeof (struct GNUNET_PeerIdentity));
-
- GDS_DATACACHE_handle_put (GNUNET_TIME_absolute_ntoh (prm->expiration_time),
- &prm->key,
- get_path_length + put_path_length,
- xput_path,
- type,
- data_size,
- data);
- }
- /* forward to other peers */
- GDS_ROUTING_process (NULL,
- type,
- GNUNET_TIME_absolute_ntoh (prm->expiration_time),
- &prm->key,
- put_path_length,
- put_path,
- get_path_length,
- xget_path,
- data,
- data_size);
+ process_reply_with_path (exp_time,
+ &prm->key,
+ get_path_length + 1,
+ xget_path,
+ put_path_length,
+ put_path,
+ type,
+ data_size,
+ data);
}
}
log_route_details_stderr =
(NULL != getenv("GNUNET_DHT_ROUTE_DEBUG")) ? GNUNET_YES : GNUNET_NO;
ats_ch = GNUNET_ATS_connectivity_init (GDS_cfg);
- core_api = GNUNET_CORE_connecT (GDS_cfg,
+ core_api = GNUNET_CORE_connect (GDS_cfg,
NULL,
&core_init,
&handle_core_connect,
{
if (NULL == core_api)
return;
- GNUNET_CORE_disconnecT (core_api);
+ GNUNET_CORE_disconnect (core_api);
core_api = NULL;
GNUNET_assert (0 ==
GNUNET_CONTAINER_multipeermap_size (all_connected_peers));
projects / oweals / gnunet.git / blobdiff