enum GNUNET_BLOCK_EvaluationResult eval;
unsigned int gpl;
unsigned int ppl;
+ GNUNET_HashCode hc;
+ const GNUNET_HashCode *eval_key;
if ( (rr->type != GNUNET_BLOCK_TYPE_ANY) &&
(rr->type != pc->type) )
gpl = 0;
ppl = 0;
}
+ if ( (0 != (rr->options & GNUNET_DHT_RO_FIND_PEER)) &&
+ (pc->type == GNUNET_BLOCK_TYPE_DHT_HELLO) )
+ {
+ /* key may not match HELLO, which is OK since
+ the search is approximate. Still, the evaluation
+ would fail since the match is not exact. So
+ we fake it by changing the key to the actual PID ... */
+ GNUNET_BLOCK_get_key (GDS_block_context,
+ GNUNET_BLOCK_TYPE_DHT_HELLO,
+ pc->data, pc->data_size,
+ &hc);
+ eval_key = &hc;
+ }
+ else
+ {
+ eval_key = key;
+ }
eval = GNUNET_BLOCK_evaluate (GDS_block_context,
pc->type,
- key,
+ eval_key,
&rr->reply_bf,
rr->reply_bf_mutator,
rr->xquery,
{
case GNUNET_BLOCK_EVALUATION_OK_MORE:
case GNUNET_BLOCK_EVALUATION_OK_LAST:
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Good REPLIES matched against routing table"), 1,
+ GNUNET_NO);
GDS_NEIGHBOURS_handle_reply (&rr->peer,
pc->type,
pc->expiration_time,
pc->data_size);
break;
case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Duplicate REPLIES matched against routing table"), 1,
+ GNUNET_NO);
return GNUNET_OK;
case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
- GNUNET_break_op (0);
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Invalid REPLIES matched against routing table"), 1,
+ GNUNET_NO);
return GNUNET_SYSERR;
case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
GNUNET_break (0);
return GNUNET_OK;
case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Unsupported REPLIES matched against routing table"), 1,
+ GNUNET_NO);
return GNUNET_SYSERR;
default:
GNUNET_break (0);
while (GNUNET_CONTAINER_heap_get_size (recent_heap) >= DHT_MAX_RECENT)
{
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Entries removed from routing table"), 1,
+ GNUNET_NO);
recent_req = GNUNET_CONTAINER_heap_peek (recent_heap);
GNUNET_assert (recent_req != NULL);
GNUNET_CONTAINER_heap_remove_node (recent_req->heap_node);
GNUNET_free (recent_req);
}
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Entries added to routing table"), 1,
+ GNUNET_NO);
recent_req = GNUNET_malloc (sizeof (struct RecentRequest) + xquery_size);
recent_req->peer = *sender;
recent_req->key = *key;
while (GNUNET_CONTAINER_heap_get_size (recent_heap) > 0)
{
+ GNUNET_STATISTICS_update (GDS_stats,
+ gettext_noop ("# Entries removed from routing table"), 1,
+ GNUNET_NO);
recent_req = GNUNET_CONTAINER_heap_peek (recent_heap);
GNUNET_assert (recent_req != NULL);
GNUNET_CONTAINER_heap_remove_node (recent_req->heap_node);