process find peer requests and replies

1 files changed, 20 insertions, 1 deletions

diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 41996d654..5a87f8b32 100644
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -169,6 +169,8 @@ process (void *cls,
   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) )
@@ -184,9 +186,26 @@ process (void *cls,
     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,