cqr->replication,
cqr->seen_replies_count);
- /* FIXME: Here I am passing NULL for parameters check if its correct or
- not. */
-#if 0
- GDS_NEIGHBOURS_handle_get (cqr->type, cqr->msg_options, cqr->replication,
- 0 /* hop count */ ,NULL, NULL, 0,
- &cqr->key, NULL, NULL, 0);
-#endif
+ struct GNUNET_PeerIdentity my_identity;
+ my_identity = GDS_NEIGHBOURS_get_my_id ();
+ GDS_NEIGHBOURS_send_get (&cqr->key, cqr->type, cqr->msg_options,
+ cqr->replication, my_identity, my_identity, NULL,
+ 0, 0, NULL);
+
/* exponential back-off for retries.
* max GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD (15 min) */
cqr->retry_frequency = GNUNET_TIME_STD_BACKOFF (cqr->retry_frequency);
struct PendingMessage *pm;
struct GNUNET_DHT_ClientPutConfirmationMessage *conf;
uint16_t size;
-
+
size = ntohs (message->size);
if (size < sizeof (struct GNUNET_DHT_ClientPutMessage))
{
("# PUT requests received from clients"), 1,
GNUNET_NO);
put_msg = (const struct GNUNET_DHT_ClientPutMessage *) message;
- LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, "R5N CLIENT-PUT %s\n",
+ LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, "X-VINE DHT CLIENT-PUT %s\n",
GNUNET_h2s_full (&put_msg->key));
/* give to local clients */
LOG (GNUNET_ERROR_TYPE_DEBUG,
&put_msg->key, 0, NULL, ntohl (put_msg->type),
size - sizeof (struct GNUNET_DHT_ClientPutMessage),
&put_msg[1]);
-
- /* FIXME: Is it correct to pass NULL for current destination and current
- source. */
- GDS_NEIGHBOURS_handle_put (ntohl (put_msg->type), ntohl (put_msg->options),
- ntohl (put_msg->desired_replication_level),
- GNUNET_TIME_absolute_ntoh (put_msg->expiration),
- 0 /* hop count */ ,
- &put_msg->key, 0, NULL, &put_msg[1],
- size -
- sizeof (struct GNUNET_DHT_ClientPutMessage),
- NULL, NULL, 0, NULL);
-
+
+ struct GNUNET_PeerIdentity my_identity = GDS_NEIGHBOURS_get_my_id();
+ GDS_NEIGHBOURS_send_put (&put_msg->key,
+ ntohl (put_msg->type), ntohl (put_msg->options),
+ ntohl (put_msg->desired_replication_level),
+ my_identity, my_identity, NULL, 0, 0, NULL,
+ GNUNET_TIME_absolute_ntoh (put_msg->expiration),
+ &put_msg[1],
+ size - sizeof (struct GNUNET_DHT_ClientPutMessage));
+
+
GDS_CLIENTS_process_put (ntohl (put_msg->options),
ntohl (put_msg->type),
0,
ntohl (put_msg->desired_replication_level),
1,
- GDS_NEIGHBOURS_get_id(),
+ &my_identity,
GNUNET_TIME_absolute_ntoh (put_msg->expiration),
&put_msg->key,
&put_msg[1],
"Received GET request for %s from local client %p, xq: %.*s\n",
GNUNET_h2s (&get->key), client, xquery_size, xquery);
- LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, "R5N CLIENT-GET %s\n",
+ LOG_TRAFFIC (GNUNET_ERROR_TYPE_DEBUG, "X-VINE CLIENT-GET %s\n",
GNUNET_h2s_full (&get->key));
// FIXME use cqr->key, set multihashmap create to GNUNET_YES
GNUNET_CONTAINER_multihashmap_put (forward_map, &get->key, cqr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+
+ struct GNUNET_PeerIdentity my_identity;
+ my_identity = GDS_NEIGHBOURS_get_my_id();
GDS_CLIENTS_process_get (ntohl (get->options),
ntohl (get->type),
0,
ntohl (get->desired_replication_level),
1,
- GDS_NEIGHBOURS_get_id(),
+ &my_identity,
&get->key);
/* start remote requests */
if (GNUNET_SCHEDULER_NO_TASK != retry_task)
GNUNET_SCHEDULER_cancel (retry_task);
retry_task = GNUNET_SCHEDULER_add_now (&transmit_next_request_task, NULL);
- /* perform local lookup
- * FIXME: Should we call it here or in neighbours file. And how to handle
- * this case where we may get the data locally. You really need to rethink
- * this design again.
- GDS_DATACACHE_handle_get (&get->key, cqr->type, cqr->xquery, xquery_size,
- NULL, 0); */
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}