[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21178 - in gnunet/src: dht fs gns include mesh
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r21178 - in gnunet/src: dht fs gns include mesh |
|
Date: |
Thu, 26 Apr 2012 18:56:00 +0200 |
Author: grothoff
Date: 2012-04-26 18:56:00 +0200 (Thu, 26 Apr 2012)
New Revision: 21178
Modified:
gnunet/src/dht/dht.h
gnunet/src/dht/dht_api.c
gnunet/src/dht/gnunet-dht-put.c
gnunet/src/dht/gnunet-service-dht_clients.c
gnunet/src/dht/test_dht_api.c
gnunet/src/dht/test_dht_multipeer.c
gnunet/src/dht/test_dht_twopeer_path_tracking.c
gnunet/src/dht/test_dht_twopeer_put_get.c
gnunet/src/fs/gnunet-service-fs_put.c
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/include/gnunet_dht_service.h
gnunet/src/include/gnunet_protocols.h
gnunet/src/mesh/gnunet-service-mesh.c
Log:
-fixing #2277
Modified: gnunet/src/dht/dht.h
===================================================================
--- gnunet/src/dht/dht.h 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/dht/dht.h 2012-04-26 16:56:00 UTC (rev 21178)
@@ -181,6 +181,11 @@
uint32_t desired_replication_level GNUNET_PACKED;
/**
+ * Unique ID for the PUT message.
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+ /**
* How long should this data persist?
*/
struct GNUNET_TIME_AbsoluteNBO expiration;
@@ -196,6 +201,30 @@
/**
+ * Message to confirming receipt of PUT, sent from DHT service to clients.
+ */
+struct GNUNET_DHT_ClientPutConfirmationMessage
+{
+ /**
+ * Type: GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK
+ */
+ struct GNUNET_MessageHeader header;
+
+ /**
+ * Always zero.
+ */
+ uint32_t reserved GNUNET_PACKED;
+
+ /**
+ * Unique ID from the PUT message that is being confirmed.
+ */
+ uint64_t unique_id GNUNET_PACKED;
+
+};
+
+
+
+/**
* Message to monitor put requests going through peer, DHT service -> clients.
*/
struct GNUNET_DHT_MonitorPutMessage
Modified: gnunet/src/dht/dht_api.c
===================================================================
--- gnunet/src/dht/dht_api.c 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/dht/dht_api.c 2012-04-26 16:56:00 UTC (rev 21178)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+ (C) 2009, 2010, 2011, 2012 Christian Grothoff (and other contributing
authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -74,11 +74,6 @@
void *cont_cls;
/**
- * Timeout task for this message
- */
- GNUNET_SCHEDULER_TaskIdentifier timeout_task;
-
- /**
* Unique ID for this request
*/
uint64_t unique_id;
@@ -100,6 +95,56 @@
/**
+ * Handle to a PUT request.
+ */
+struct GNUNET_DHT_PutHandle
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_DHT_PutHandle *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_DHT_PutHandle *prev;
+
+ /**
+ * Continuation to call when done.
+ */
+ GNUNET_DHT_PutContinuation cont;
+
+ /**
+ * Pending message associated with this PUT operation,
+ * NULL after the message has been transmitted to the service.
+ */
+ struct PendingMessage *pending;
+
+ /**
+ * Main handle to this DHT api
+ */
+ struct GNUNET_DHT_Handle *dht_handle;
+
+ /**
+ * Closure for 'cont'.
+ */
+ void *cont_cls;
+
+ /**
+ * Timeout task for this operation.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+ /**
+ * Unique ID for the PUT operation.
+ */
+ uint64_t unique_id;
+
+};
+
+
+
+/**
* Handle to a GET request
*/
struct GNUNET_DHT_GetHandle
@@ -235,9 +280,19 @@
struct GNUNET_DHT_MonitorHandle *monitor_tail;
/**
- * Hash map containing the current outstanding unique requests
- * (values are of type 'struct GNUNET_DHT_RouteHandle').
+ * Head of active PUT requests.
*/
+ struct GNUNET_DHT_PutHandle *put_head;
+
+ /**
+ * Tail of active PUT requests.
+ */
+ struct GNUNET_DHT_PutHandle *put_tail;
+
+ /**
+ * Hash map containing the current outstanding unique GET requests
+ * (values are of type 'struct GNUNET_DHT_GetHandle').
+ */
struct GNUNET_CONTAINER_MultiHashMap *active_requests;
/**
@@ -267,6 +322,8 @@
* Handler for messages received from the DHT service
* a demultiplexer which handles numerous message types
*
+ * @param cls the 'struct GNUNET_DHT_Handle'
+ * @param msg the incoming message
*/
static void
service_message_handler (void *cls, const struct GNUNET_MessageHeader *msg);
@@ -275,16 +332,17 @@
/**
* Try to (re)connect to the DHT service.
*
+ * @param handle DHT handle to reconnect
* @return GNUNET_YES on success, GNUNET_NO on failure.
*/
static int
try_connect (struct GNUNET_DHT_Handle *handle)
{
- if (handle->client != NULL)
+ if (NULL != handle->client)
return GNUNET_OK;
handle->in_receive = GNUNET_NO;
handle->client = GNUNET_CLIENT_connect ("dht", handle->cfg);
- if (handle->client == NULL)
+ if (NULL == handle->client)
{
LOG (GNUNET_ERROR_TYPE_WARNING,
_("Failed to connect to the DHT service!\n"));
@@ -324,6 +382,7 @@
/**
* Try to send messages from list of messages to send
+ *
* @param handle DHT_Handle
*/
static void
@@ -369,9 +428,12 @@
static void
do_disconnect (struct GNUNET_DHT_Handle *handle)
{
- if (handle->client == NULL)
+ struct GNUNET_DHT_PutHandle *ph;
+ struct GNUNET_DHT_PutHandle *next;
+
+ if (NULL == handle->client)
return;
- GNUNET_assert (handle->reconnect_task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == handle->reconnect_task);
if (NULL != handle->th)
GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
handle->th = NULL;
@@ -380,6 +442,20 @@
(unsigned long long) handle->retry_time.rel_value);
GNUNET_CLIENT_disconnect (handle->client);
handle->client = NULL;
+
+ /* signal disconnect to all PUT requests that were transmitted but waiting
+ for the put confirmation */
+ next = handle->put_head;
+ while (NULL != (ph = next))
+ {
+ next = ph->next;
+ if (NULL == ph->pending)
+ {
+ if (NULL != ph->cont)
+ ph->cont (ph->cont_cls, GNUNET_SYSERR);
+ GNUNET_DHT_put_cancel (ph);
+ }
+ }
handle->reconnect_task =
GNUNET_SCHEDULER_add_delayed (handle->retry_time, &try_reconnect,
handle);
}
@@ -387,6 +463,11 @@
/**
* Transmit the next pending message, called by notify_transmit_ready
+ *
+ * @param cls the DHT handle
+ * @param size number of bytes available in 'buf' for transmission
+ * @param buf where to copy messages for the service
+ * @return number of bytes written to 'buf'
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf);
@@ -394,20 +475,22 @@
/**
* Try to send messages from list of messages to send
+ *
+ * @param handle handle to DHT
*/
static void
process_pending_messages (struct GNUNET_DHT_Handle *handle)
{
struct PendingMessage *head;
- if (handle->client == NULL)
+ if (NULL == handle->client)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "process_pending_messages called, but client is null,
reconnecting\n");
+ "process_pending_messages called, but client is NULL,
reconnecting\n");
do_disconnect (handle);
return;
}
- if (handle->th != NULL)
+ if (NULL != handle->th)
return;
if (NULL == (head = handle->pending_head))
return;
@@ -427,6 +510,11 @@
/**
* Transmit the next pending message, called by notify_transmit_ready
+ *
+ * @param cls the DHT handle
+ * @param size number of bytes available in 'buf' for transmission
+ * @param buf where to copy messages for the service
+ * @return number of bytes written to 'buf'
*/
static size_t
transmit_pending (void *cls, size_t size, void *buf)
@@ -436,7 +524,7 @@
size_t tsize;
handle->th = NULL;
- if (buf == NULL)
+ if (NULL == buf)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmission to DHT service failed! Reconnecting!\n");
@@ -456,11 +544,6 @@
GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
head);
head->in_pending_queue = GNUNET_NO;
- if (head->timeout_task != GNUNET_SCHEDULER_NO_TASK)
- {
- GNUNET_SCHEDULER_cancel (head->timeout_task);
- head->timeout_task = GNUNET_SCHEDULER_NO_TASK;
- }
if (NULL != head->cont)
{
head->cont (head->cont_cls, NULL);
@@ -557,33 +640,24 @@
const struct GNUNET_DHT_MonitorGetMessage *msg)
{
struct GNUNET_DHT_MonitorHandle *h;
- size_t msize;
- msize = ntohs (msg->header.size);
- if (msize < sizeof (struct GNUNET_DHT_MonitorGetMessage))
- return GNUNET_SYSERR;
-
- h = handle->monitor_head;
- while (NULL != h)
+ for (h = handle->monitor_head; NULL != h; h = h->next)
{
int type_ok;
int key_ok;
- type_ok = GNUNET_BLOCK_TYPE_ANY == h->type || h->type == ntohl(msg->type);
- key_ok = NULL == h->key || memcmp (h->key, &msg->key,
- sizeof (GNUNET_HashCode)) == 0;
- if (type_ok && key_ok && NULL != h->get_cb)
- {
+ type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type ==
ntohl(msg->type));
+ key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key,
+ sizeof (GNUNET_HashCode)));
+ if (type_ok && key_ok && (NULL != h->get_cb))
h->get_cb (h->cb_cls,
- ntohl (msg->options),
- (enum GNUNET_BLOCK_Type) ntohl(msg->type),
- ntohl (msg->hop_count),
- ntohl (msg->desired_replication_level),
- ntohl (msg->get_path_length),
- (struct GNUNET_PeerIdentity *) &msg[1],
- &msg->key);
- }
- h = h->next;
+ ntohl (msg->options),
+ (enum GNUNET_BLOCK_Type) ntohl(msg->type),
+ ntohl (msg->hop_count),
+ ntohl (msg->desired_replication_level),
+ ntohl (msg->get_path_length),
+ (struct GNUNET_PeerIdentity *) &msg[1],
+ &msg->key);
}
return GNUNET_OK;
}
@@ -593,8 +667,7 @@
* Process a get response monitor message from the service.
*
* @param handle The DHT handle.
- * @param msg Monitor get response message from the service.
- *
+ * @param msg monitor get response message from the service
* @return GNUNET_OK if everything went fine,
* GNUNET_SYSERR if the message is malformed.
*/
@@ -604,30 +677,30 @@
*msg)
{
struct GNUNET_DHT_MonitorHandle *h;
+ struct GNUNET_PeerIdentity *path;
+ uint32_t getl;
+ uint32_t putl;
size_t msize;
msize = ntohs (msg->header.size);
- if (msize < sizeof (struct GNUNET_DHT_MonitorGetRespMessage))
+ path = (struct GNUNET_PeerIdentity *) &msg[1];
+ getl = ntohl (msg->get_path_length);
+ putl = ntohl (msg->put_path_length);
+ if ( (getl + putl < getl) ||
+ ( ((msize - sizeof (struct GNUNET_DHT_MonitorGetRespMessage)) / sizeof
(struct GNUNET_PeerIdentity)) < getl + putl) )
+ {
+ GNUNET_break (0);
return GNUNET_SYSERR;
-
- h = handle->monitor_head;
- while (NULL != h)
+ }
+ for (h = handle->monitor_head; NULL != h; h = h->next)
{
int type_ok;
int key_ok;
- type_ok = GNUNET_BLOCK_TYPE_ANY == h->type || h->type == ntohl(msg->type);
- key_ok = NULL == h->key || memcmp (h->key, &msg->key,
- sizeof (GNUNET_HashCode)) == 0;
- if (type_ok && key_ok && NULL != h->get_resp_cb)
- {
- struct GNUNET_PeerIdentity *path;
- uint32_t getl;
- uint32_t putl;
-
- path = (struct GNUNET_PeerIdentity *) &msg[1];
- getl = ntohl (msg->get_path_length);
- putl = ntohl (msg->put_path_length);
+ type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type ==
ntohl(msg->type));
+ key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key,
+ sizeof (GNUNET_HashCode)));
+ if (type_ok && key_ok && (NULL != h->get_resp_cb))
h->get_resp_cb (h->cb_cls,
(enum GNUNET_BLOCK_Type) ntohl(msg->type),
path, getl,
@@ -638,8 +711,6 @@
msize -
sizeof (struct GNUNET_DHT_MonitorGetRespMessage) -
sizeof (struct GNUNET_PeerIdentity) * (putl + getl));
- }
- h = h->next;
}
return GNUNET_OK;
}
@@ -660,27 +731,26 @@
{
struct GNUNET_DHT_MonitorHandle *h;
size_t msize;
+ struct GNUNET_PeerIdentity *path;
+ uint32_t putl;
msize = ntohs (msg->header.size);
- if (msize < sizeof (struct GNUNET_DHT_MonitorPutMessage))
+ path = (struct GNUNET_PeerIdentity *) &msg[1];
+ putl = ntohl (msg->put_path_length);
+ if (((msize - sizeof (struct GNUNET_DHT_MonitorGetRespMessage)) / sizeof
(struct GNUNET_PeerIdentity)) < putl)
+ {
+ GNUNET_break (0);
return GNUNET_SYSERR;
-
- h = handle->monitor_head;
- while (NULL != h)
+ }
+ for (h = handle->monitor_head; NULL != h; h = h->next)
{
int type_ok;
int key_ok;
- type_ok = GNUNET_BLOCK_TYPE_ANY == h->type || h->type == ntohl(msg->type);
- key_ok = NULL == h->key || memcmp (h->key, &msg->key,
- sizeof (GNUNET_HashCode)) == 0;
- if (type_ok && key_ok && NULL != h->put_cb)
- {
- struct GNUNET_PeerIdentity *path;
- uint32_t putl;
-
- path = (struct GNUNET_PeerIdentity *) &msg[1];
- putl = ntohl (msg->put_path_length);
+ type_ok = (GNUNET_BLOCK_TYPE_ANY == h->type) || (h->type ==
ntohl(msg->type));
+ key_ok = (NULL == h->key) || (0 == memcmp (h->key, &msg->key,
+ sizeof (GNUNET_HashCode)));
+ if (type_ok && key_ok && (NULL != h->put_cb))
h->put_cb (h->cb_cls,
ntohl (msg->options),
(enum GNUNET_BLOCK_Type) ntohl(msg->type),
@@ -693,55 +763,41 @@
msize -
sizeof (struct GNUNET_DHT_MonitorPutMessage) -
sizeof (struct GNUNET_PeerIdentity) * putl);
- }
- h = h->next;
}
return GNUNET_OK;
}
/**
- * Process a monitoring message from the service: demultiplex for proper type.
+ * Process a put confirmation message from the service.
*
* @param handle The DHT handle.
- * @param msg Message from the service.
- *
+ * @param msg confirmation message from the service.
* @return GNUNET_OK if everything went fine,
* GNUNET_SYSERR if the message is malformed.
*/
static int
-process_monitor_message (struct GNUNET_DHT_Handle *handle,
- const struct GNUNET_MessageHeader *msg)
+process_put_confirmation_message (struct GNUNET_DHT_Handle *handle,
+ const struct
GNUNET_DHT_ClientPutConfirmationMessage *msg)
{
- switch (ntohs (msg->type))
- {
- case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET:
- return process_monitor_get_message(handle,
- (struct GNUNET_DHT_MonitorGetMessage
*)
- msg);
+ struct GNUNET_DHT_PutHandle *ph;
+ GNUNET_DHT_PutContinuation cont;
+ void *cont_cls;
- case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP:
- {
- return process_monitor_get_resp_message(
- handle,
- (struct GNUNET_DHT_MonitorGetRespMessage *) msg);
- }
- case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT:
- {
- return process_monitor_put_message(handle,
- (struct GNUNET_DHT_MonitorPutMessage
*)
- msg);
- }
- case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT_RESP:
- /* Not implemented yet */
- GNUNET_break(0);
- /* Fall through */
- default:
- GNUNET_break(0);
- return GNUNET_SYSERR;
- }
+ for (ph = handle->put_head; NULL != ph; ph = ph->next)
+ if (ph->unique_id == msg->unique_id)
+ break;
+ if (NULL == ph)
+ return GNUNET_OK;
+ cont = ph->cont;
+ cont_cls = ph->cont_cls;
+ GNUNET_DHT_put_cancel (ph);
+ if (NULL != cont)
+ cont (cont_cls, GNUNET_OK);
+ return GNUNET_OK;
}
+
/**
* Handler for messages received from the DHT service
* a demultiplexer which handles numerous message types
@@ -754,38 +810,84 @@
{
struct GNUNET_DHT_Handle *handle = cls;
const struct GNUNET_DHT_ClientResultMessage *dht_msg;
+ uint16_t msize;
+ int ret;
- if (msg == NULL)
+ if (NULL == msg)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Error receiving data from DHT service, reconnecting\n");
do_disconnect (handle);
return;
}
- if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT)
+ ret = GNUNET_SYSERR;
+ msize = ntohs (msg->size);
+ switch (ntohs (msg->type))
{
- if (process_monitor_message (handle, msg) == GNUNET_OK)
+ case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET:
+ if (msize < sizeof (struct GNUNET_DHT_MonitorGetMessage))
{
- GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return;
+ GNUNET_break (0);
+ break;
}
- GNUNET_break (0);
- do_disconnect (handle);
- return;
+ ret = process_monitor_get_message(handle,
+ (const struct
GNUNET_DHT_MonitorGetMessage *) msg);
+ break;
+ case GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP:
+ if (msize < sizeof (struct GNUNET_DHT_MonitorGetRespMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ ret = process_monitor_get_resp_message(handle,
+ (const struct
GNUNET_DHT_MonitorGetRespMessage *) msg);
+ break;
+ case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT:
+ if (msize < sizeof (struct GNUNET_DHT_MonitorPutMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ ret = process_monitor_put_message(handle,
+ (const struct
GNUNET_DHT_MonitorPutMessage *) msg);
+ break;
+ case GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT_RESP:
+ /* Not implemented yet */
+ GNUNET_break(0);
+ break;
+ case GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT:
+ if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_ClientResultMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ ret = GNUNET_OK;
+ dht_msg = (const struct GNUNET_DHT_ClientResultMessage *) msg;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Received reply for `%s' from DHT service
%p\n",
+ GNUNET_h2s (&dht_msg->key), handle);
+ GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
+ &dht_msg->key, &process_reply,
+ (void *) dht_msg);
+ break;
+ case GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK:
+ if (ntohs (msg->size) != sizeof (struct
GNUNET_DHT_ClientPutConfirmationMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ ret = process_put_confirmation_message (handle,
+ (const struct
GNUNET_DHT_ClientPutConfirmationMessage*) msg);
+ break;
+ default:
+ GNUNET_break(0);
+ break;
}
- if (ntohs (msg->size) < sizeof (struct GNUNET_DHT_ClientResultMessage))
+ if (GNUNET_OK != ret)
{
GNUNET_break (0);
do_disconnect (handle);
return;
}
- dht_msg = (const struct GNUNET_DHT_ClientResultMessage *) msg;
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Received reply for `%s' from DHT service
%p\n",
- GNUNET_h2s (&dht_msg->key), handle);
- GNUNET_CONTAINER_multihashmap_get_multiple (handle->active_requests,
- &dht_msg->key, &process_reply,
- (void *) dht_msg);
GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
}
@@ -829,11 +931,12 @@
GNUNET_DHT_disconnect (struct GNUNET_DHT_Handle *handle)
{
struct PendingMessage *pm;
+ struct GNUNET_DHT_PutHandle *ph;
- GNUNET_assert (handle != NULL);
+ GNUNET_assert (NULL != handle);
GNUNET_assert (0 ==
GNUNET_CONTAINER_multihashmap_size (handle->active_requests));
- if (handle->th != NULL)
+ if (NULL != handle->th)
{
GNUNET_CLIENT_notify_transmit_ready_cancel (handle->th);
handle->th = NULL;
@@ -845,18 +948,24 @@
pm);
pm->in_pending_queue = GNUNET_NO;
GNUNET_assert (GNUNET_YES == pm->free_on_send);
- if (GNUNET_SCHEDULER_NO_TASK != pm->timeout_task)
- GNUNET_SCHEDULER_cancel (pm->timeout_task);
if (NULL != pm->cont)
pm->cont (pm->cont_cls, NULL);
GNUNET_free (pm);
}
- if (handle->client != NULL)
+ while (NULL != (ph = handle->put_head))
{
+ GNUNET_break (NULL == ph->pending);
+ if (NULL != ph->cont)
+ ph->cont (ph->cont_cls, GNUNET_SYSERR);
+ GNUNET_DHT_put_cancel (ph);
+ }
+
+ if (NULL != handle->client)
+ {
GNUNET_CLIENT_disconnect (handle->client);
handle->client = NULL;
}
- if (handle->reconnect_task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != handle->reconnect_task)
GNUNET_SCHEDULER_cancel (handle->reconnect_task);
GNUNET_CONTAINER_multihashmap_destroy (handle->active_requests);
GNUNET_free (handle);
@@ -872,21 +981,44 @@
static void
timeout_put_request (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct PendingMessage *pending = cls;
- struct GNUNET_DHT_Handle *handle;
+ struct GNUNET_DHT_PutHandle *ph = cls;
+ struct GNUNET_DHT_Handle *handle = ph->dht_handle;
- handle = pending->handle;
- GNUNET_assert (GNUNET_YES == pending->in_pending_queue);
- GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
- pending);
- pending->in_pending_queue = GNUNET_NO;
- if (pending->cont != NULL)
- pending->cont (pending->cont_cls, tc);
- GNUNET_free (pending);
+ ph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ if (NULL != ph->pending)
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head, handle->pending_tail,
+ ph->pending);
+ ph->pending->in_pending_queue = GNUNET_NO;
+ GNUNET_free (ph->pending);
+ }
+ if (NULL != ph->cont)
+ ph->cont (ph->cont_cls, GNUNET_NO);
+ GNUNET_CONTAINER_DLL_remove (handle->put_head,
+ handle->put_tail,
+ ph);
+ GNUNET_free (ph);
}
/**
+ * Function called whenever the PUT message leaves the queue. Sets
+ * the message pointer in the put handle to NULL.
+ *
+ * @param cls the 'struct GNUNET_DHT_PutHandle'
+ * @param tc unused
+ */
+static void
+mark_put_message_gone (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_DHT_PutHandle *ph = cls;
+
+ ph->pending = NULL;
+}
+
+
+/**
* Perform a PUT operation storing data in the DHT. FIXME: we should
* change the protocol to get a confirmation for the PUT from the DHT
* and call 'cont' only after getting the confirmation; otherwise, the
@@ -907,53 +1039,98 @@
* You must not call GNUNET_DHT_DISCONNECT in this continuation
* @param cont_cls closure for cont
*/
-void
+struct GNUNET_DHT_PutHandle *
GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, const GNUNET_HashCode * key,
uint32_t desired_replication_level,
enum GNUNET_DHT_RouteOption options,
enum GNUNET_BLOCK_Type type, size_t size, const char *data,
struct GNUNET_TIME_Absolute exp,
- struct GNUNET_TIME_Relative timeout, GNUNET_SCHEDULER_Task
cont,
+ struct GNUNET_TIME_Relative timeout,
GNUNET_DHT_PutContinuation cont,
void *cont_cls)
{
struct GNUNET_DHT_ClientPutMessage *put_msg;
size_t msize;
struct PendingMessage *pending;
+ struct GNUNET_DHT_PutHandle *ph;
msize = sizeof (struct GNUNET_DHT_ClientPutMessage) + size;
if ((msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
(size >= GNUNET_SERVER_MAX_MESSAGE_SIZE))
{
GNUNET_break (0);
- if (NULL != cont)
- cont (cont_cls, NULL);
- return;
+ return NULL;
}
+ ph = GNUNET_malloc (sizeof (struct GNUNET_DHT_PutHandle));
+ ph->dht_handle = handle;
+ ph->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
&timeout_put_request, ph);
+ ph->cont = cont;
+ ph->cont_cls = cont_cls;
+ ph->unique_id = ++handle->uid_gen;
pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ ph->pending = pending;
put_msg = (struct GNUNET_DHT_ClientPutMessage *) &pending[1];
pending->msg = &put_msg->header;
pending->handle = handle;
- pending->cont = cont;
- pending->cont_cls = cont_cls;
+ pending->cont = &mark_put_message_gone;
+ pending->cont_cls = ph;
pending->free_on_send = GNUNET_YES;
- pending->timeout_task =
- GNUNET_SCHEDULER_add_delayed (timeout, &timeout_put_request, pending);
put_msg->header.size = htons (msize);
put_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT);
put_msg->type = htonl (type);
put_msg->options = htonl ((uint32_t) options);
put_msg->desired_replication_level = htonl (desired_replication_level);
+ put_msg->unique_id = ph->unique_id;
put_msg->expiration = GNUNET_TIME_absolute_hton (exp);
put_msg->key = *key;
memcpy (&put_msg[1], data, size);
GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
pending);
pending->in_pending_queue = GNUNET_YES;
+ GNUNET_CONTAINER_DLL_insert_tail (handle->put_head,
+ handle->put_tail,
+ ph);
process_pending_messages (handle);
+ return ph;
}
/**
+ * Cancels a DHT PUT operation. Note that the PUT request may still
+ * go out over the network (we can't stop that); However, if the PUT
+ * has not yet been sent to the service, cancelling the PUT will stop
+ * this from happening (but there is no way for the user of this API
+ * to tell if that is the case). The only use for this API is to
+ * prevent a later call to 'cont' from "GNUNET_DHT_put" (i.e. because
+ * the system is shutting down).
+ *
+ * @param ph put operation to cancel ('cont' will no longer be called)
+ */
+void
+GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph)
+{
+ struct GNUNET_DHT_Handle *handle = ph->dht_handle;
+
+ if (NULL != ph->pending)
+ {
+ GNUNET_CONTAINER_DLL_remove (handle->pending_head,
+ handle->pending_tail,
+ ph->pending);
+ GNUNET_free (ph->pending);
+ ph->pending = NULL;
+ }
+ if (ph->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (ph->timeout_task);
+ ph->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ GNUNET_CONTAINER_DLL_remove (handle->put_head,
+ handle->put_tail,
+ ph);
+ GNUNET_free (ph);
+}
+
+
+/**
* Perform an asynchronous GET operation on the DHT identified. See
* also "GNUNET_BLOCK_evaluate".
*
@@ -1004,8 +1181,7 @@
get_msg->desired_replication_level = htonl (desired_replication_level);
get_msg->type = htonl (type);
get_msg->key = *key;
- handle->uid_gen++;
- get_msg->unique_id = handle->uid_gen;
+ get_msg->unique_id = ++handle->uid_gen;
memcpy (&get_msg[1], xquery, xquery_size);
GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
pending);
Modified: gnunet/src/dht/gnunet-dht-put.c
===================================================================
--- gnunet/src/dht/gnunet-dht-put.c 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/dht/gnunet-dht-put.c 2012-04-26 16:56:00 UTC (rev 21178)
@@ -80,7 +80,7 @@
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (dht_handle != NULL)
+ if (NULL != dht_handle)
{
GNUNET_DHT_disconnect (dht_handle);
dht_handle = NULL;
@@ -91,13 +91,33 @@
* Signature of the main function of a task.
*
* @param cls closure
- * @param tc context information (why was this task triggered now)
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
*/
-void
-message_sent_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+static void
+message_sent_cont (void *cls, int success)
{
if (verbose)
- FPRINTF (stderr, "%s", _("PUT request sent!\n"));
+ {
+ switch (success)
+ {
+ case GNUNET_OK:
+ FPRINTF (stderr, "%s", _("PUT request sent!\n"));
+ break;
+ case GNUNET_NO:
+ FPRINTF (stderr, "%s", _("Timeout sending PUT request!\n"));
+ break;
+ case GNUNET_SYSERR:
+ FPRINTF (stderr, "%s", _("PUT request not confirmed!\n"));
+ break;
+ default:
+ GNUNET_break (0);
+ break;
+ }
+ }
GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
}
Modified: gnunet/src/dht/gnunet-service-dht_clients.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht_clients.c 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/dht/gnunet-service-dht_clients.c 2012-04-26 16:56:00 UTC (rev
21178)
@@ -262,6 +262,31 @@
/**
+ * Task run to check for messages that need to be sent to a client.
+ *
+ * @param client a ClientList, containing the client and any messages to be
sent to it
+ */
+static void
+process_pending_messages (struct ClientList *client);
+
+
+/**
+ * Add a PendingMessage to the clients list of messages to be sent
+ *
+ * @param client the active client to send the message to
+ * @param pending_message the actual message to send
+ */
+static void
+add_pending_message (struct ClientList *client,
+ struct PendingMessage *pending_message)
+{
+ GNUNET_CONTAINER_DLL_insert_tail (client->pending_head, client->pending_tail,
+ pending_message);
+ process_pending_messages (client);
+}
+
+
+/**
* Find a client if it exists, add it otherwise.
*
* @param client the server handle to the client
@@ -304,11 +329,9 @@
if (record->client != client)
return GNUNET_YES;
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Removing client %p's record for key %s\n", client,
GNUNET_h2s (key));
-#endif
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (forward_map, key,
record));
@@ -335,9 +358,7 @@
struct PendingMessage *reply;
struct ClientMonitorRecord *monitor;
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Local client %p disconnects\n",
client);
-#endif
pos = find_active_client (client);
GNUNET_CONTAINER_DLL_remove (client_head, client_tail, pos);
if (pos->transmit_handle != NULL)
@@ -464,6 +485,8 @@
const struct GNUNET_DHT_ClientPutMessage *dht_msg;
struct GNUNET_CONTAINER_BloomFilter *peer_bf;
uint16_t size;
+ struct PendingMessage *pm;
+ struct GNUNET_DHT_ClientPutConfirmationMessage *conf;
size = ntohs (message->size);
if (size < sizeof (struct GNUNET_DHT_ClientPutMessage))
@@ -478,12 +501,10 @@
GNUNET_NO);
dht_msg = (const struct GNUNET_DHT_ClientPutMessage *) message;
/* give to local clients */
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Handling local PUT of %u-bytes for query %s\n",
size - sizeof (struct GNUNET_DHT_ClientPutMessage),
GNUNET_h2s (&dht_msg->key));
-#endif
GDS_CLIENTS_handle_reply (GNUNET_TIME_absolute_ntoh (dht_msg->expiration),
&dht_msg->key, 0, NULL, 0, NULL,
ntohl (dht_msg->type),
@@ -516,6 +537,15 @@
&dht_msg[1],
size - sizeof (struct GNUNET_DHT_ClientPutMessage));
GNUNET_CONTAINER_bloomfilter_free (peer_bf);
+ pm = GNUNET_malloc (sizeof (struct PendingMessage) +
+ sizeof (struct GNUNET_DHT_ClientPutConfirmationMessage));
+ conf = (struct GNUNET_DHT_ClientPutConfirmationMessage *) &pm[1];
+ conf->header.size = htons (sizeof (struct
GNUNET_DHT_ClientPutConfirmationMessage));
+ conf->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK);
+ conf->reserved = htonl (0);
+ conf->unique_id = dht_msg->unique_id;
+ pm->msg = &conf->header;
+ add_pending_message (find_active_client (client), pm);
GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
@@ -553,11 +583,9 @@
gettext_noop
("# GET requests received from clients"), 1,
GNUNET_NO);
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received request for %s from local client %p\n",
GNUNET_h2s (&get->key), client);
-#endif
cqr = GNUNET_malloc (sizeof (struct ClientQueryRecord) + xquery_size);
cqr->key = get->key;
cqr->client = find_active_client (client);
@@ -625,11 +653,9 @@
if (record->unique_id != ctx->unique_id)
return GNUNET_YES;
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Removing client %p's record for key %s (by unique id)\n",
ctx->client->client_handle, GNUNET_h2s (key));
-#endif
return remove_client_records (ctx->client, key, record);
}
@@ -655,10 +681,8 @@
gettext_noop
("# GET STOP requests received from clients"), 1,
GNUNET_NO);
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p stopped request for key
%s\n",
client, GNUNET_h2s (&dht_stop_msg->key));
-#endif
ctx.client = find_active_client (client);
ctx.unique_id = dht_stop_msg->unique_id;
GNUNET_CONTAINER_multihashmap_get_multiple (forward_map, &dht_stop_msg->key,
@@ -708,15 +732,6 @@
/**
- * Task run to check for messages that need to be sent to a client.
- *
- * @param client a ClientList, containing the client and any messages to be
sent to it
- */
-static void
-process_pending_messages (struct ClientList *client);
-
-
-/**
* Callback called as a result of issuing a GNUNET_SERVER_notify_transmit_ready
* request. A ClientList is passed as closure, take the head of the list
* and copy it into buf, which has the result of sending the message to the
@@ -741,11 +756,9 @@
if (buf == NULL)
{
/* client disconnected */
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Client %p disconnected, pending messages will be discarded\n",
client->client_handle);
-#endif
return 0;
}
off = 0;
@@ -756,17 +769,13 @@
reply);
memcpy (&cbuf[off], reply->msg, msize);
GNUNET_free (reply);
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitting %u bytes to client
%p\n",
msize, client->client_handle);
-#endif
off += msize;
}
process_pending_messages (client);
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Transmitted %u/%u bytes to client
%p\n",
(unsigned int) off, (unsigned int) size, client->client_handle);
-#endif
return off;
}
@@ -781,20 +790,16 @@
{
if ((client->pending_head == NULL) || (client->transmit_handle != NULL))
{
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Not asking for transmission to %p now: %s\n",
client->client_handle,
client->pending_head ==
NULL ? "no more messages" : "request already pending");
-#endif
return;
}
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Asking for transmission of %u bytes to client %p\n",
ntohs (client->pending_head->msg->size), client->client_handle);
-#endif
client->transmit_handle =
GNUNET_SERVER_notify_transmit_ready (client->client_handle,
ntohs (client->pending_head->
@@ -805,22 +810,6 @@
/**
- * Add a PendingMessage to the clients list of messages to be sent
- *
- * @param client the active client to send the message to
- * @param pending_message the actual message to send
- */
-static void
-add_pending_message (struct ClientList *client,
- struct PendingMessage *pending_message)
-{
- GNUNET_CONTAINER_DLL_insert_tail (client->pending_head, client->pending_tail,
- pending_message);
- process_pending_messages (client);
-}
-
-
-/**
* Closure for 'forward_reply'
*/
struct ForwardReplyContext
@@ -879,11 +868,9 @@
if ((record->type != GNUNET_BLOCK_TYPE_ANY) && (record->type != frc->type))
{
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Record type missmatch, not passing request for key %s to
local client\n",
GNUNET_h2s (key));
-#endif
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop
("# Key match, type mismatches in REPLY to
CLIENT"),
@@ -894,11 +881,9 @@
for (i = 0; i < record->seen_replies_count; i++)
if (0 == memcmp (&record->seen_replies[i], &ch, sizeof (GNUNET_HashCode)))
{
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Duplicate reply, not passing request for key %s to local
client\n",
GNUNET_h2s (key));
-#endif
GNUNET_STATISTICS_update (GDS_stats,
gettext_noop
("# Duplicate REPLIES to CLIENT request
dropped"),
@@ -909,11 +894,9 @@
GNUNET_BLOCK_evaluate (GDS_block_context, record->type, key, NULL, 0,
record->xquery, record->xquery_size, frc->data,
frc->data_size);
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Evaluation result is %d for key %s for local client's query\n",
(int) eval, GNUNET_h2s (key));
-#endif
switch (eval)
{
case GNUNET_BLOCK_EVALUATION_OK_LAST:
@@ -964,11 +947,9 @@
GNUNET_NO);
reply = (struct GNUNET_DHT_ClientResultMessage *) &pm[1];
reply->unique_id = record->unique_id;
-#if DEBUG_DHT
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Queueing reply to query %s for client %p\n", GNUNET_h2s (key),
record->client->client_handle);
-#endif
add_pending_message (record->client, pm);
if (GNUNET_YES == do_free)
remove_client_records (record->client, key, record);
Modified: gnunet/src/dht/test_dht_api.c
===================================================================
--- gnunet/src/dht/test_dht_api.c 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/dht/test_dht_api.c 2012-04-26 16:56:00 UTC (rev 21178)
@@ -195,10 +195,10 @@
* Signature of the main function of a task.
*
* @param cls closure
- * @param tc context information (why was this task triggered now)
+ * @param success result of PUT
*/
static void
-test_get (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+test_get (void *cls, int success)
{
struct PeerContext *peer = cls;
GNUNET_HashCode hash;
Modified: gnunet/src/dht/test_dht_multipeer.c
===================================================================
--- gnunet/src/dht/test_dht_multipeer.c 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/dht/test_dht_multipeer.c 2012-04-26 16:56:00 UTC (rev 21178)
@@ -678,7 +678,7 @@
* Called when the PUT request has been transmitted to the DHT service.
*/
static void
-put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+put_finished (void *cls, int success)
{
struct TestPutContext *test_put = cls;
Modified: gnunet/src/dht/test_dht_twopeer_path_tracking.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_path_tracking.c 2012-04-26 16:19:46 UTC
(rev 21177)
+++ gnunet/src/dht/test_dht_twopeer_path_tracking.c 2012-04-26 16:56:00 UTC
(rev 21178)
@@ -249,7 +249,7 @@
* Schedule the GET request for some time in the future.
*/
static void
-put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+put_finished (void *cls, int success)
{
GNUNET_HashCode key; /* Key for data lookup */
Modified: gnunet/src/dht/test_dht_twopeer_put_get.c
===================================================================
--- gnunet/src/dht/test_dht_twopeer_put_get.c 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/dht/test_dht_twopeer_put_get.c 2012-04-26 16:56:00 UTC (rev
21178)
@@ -129,9 +129,15 @@
static struct GNUNET_DHT_Handle *peer2dht;
/**
+ * Handle for our PUT operation.
+ */
+static struct GNUNET_DHT_PutHandle *put_op;
+
+
+/**
* Check whether peers successfully shut down.
*/
-void
+static void
shutdown_callback (void *cls, const char *emsg)
{
if (emsg != NULL)
@@ -164,6 +170,11 @@
static void
end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != put_op)
+ {
+ GNUNET_DHT_put_cancel (put_op);
+ put_op = NULL;
+ }
if (peer1dht != NULL)
GNUNET_DHT_disconnect (peer1dht);
@@ -174,6 +185,7 @@
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
}
+
/**
* Check if the get_handle is being used, if so stop the request. Either
* way, schedule the end_badly_cont function which actually shuts down the
@@ -242,10 +254,11 @@
* Schedule the GET request for some time in the future.
*/
static void
-put_finished (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+put_finished (void *cls, int success)
{
GNUNET_HashCode key; /* Key for data lookup */
+ put_op = NULL;
GNUNET_SCHEDULER_cancel (die_task);
die_task =
GNUNET_SCHEDULER_add_delayed (GET_TIMEOUT, &end_badly,
@@ -272,9 +285,9 @@
memset (data, 43, sizeof (data));
/* Insert the data at the first peer */
- GNUNET_DHT_put (peer1dht, &key, 1, GNUNET_DHT_RO_NONE,
GNUNET_BLOCK_TYPE_TEST,
- sizeof (data), data, GNUNET_TIME_UNIT_FOREVER_ABS,
- GNUNET_TIME_UNIT_FOREVER_REL, &put_finished, NULL);
+ put_op = GNUNET_DHT_put (peer1dht, &key, 1, GNUNET_DHT_RO_NONE,
GNUNET_BLOCK_TYPE_TEST,
+ sizeof (data), data, GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_TIME_UNIT_FOREVER_REL, &put_finished, NULL);
}
Modified: gnunet/src/fs/gnunet-service-fs_put.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_put.c 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/fs/gnunet-service-fs_put.c 2012-04-26 16:56:00 UTC (rev
21178)
@@ -33,7 +33,12 @@
*/
#define MAX_DHT_PUT_FREQ GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
+/**
+ * How many replicas do we try to create per PUT?
+ */
+#define DEFAULT_PUT_REPLICATION 5
+
/**
* Context for each zero-anonymity iterator.
*/
@@ -51,6 +56,11 @@
enum GNUNET_BLOCK_Type dht_put_type;
/**
+ * Handle to PUT operation.
+ */
+ struct GNUNET_DHT_PutHandle *dht_put;
+
+ /**
* ID of task that collects blocks for DHT PUTs.
*/
GNUNET_SCHEDULER_TaskIdentifier dht_task;
@@ -92,20 +102,15 @@
/**
- * Task that is run periodically to obtain blocks for DHT PUTs.
+ * Calculate when to run the next PUT operation and schedule it.
*
- * @param cls type of blocks to gather
- * @param tc scheduler context (unused)
+ * @param po put operator to schedule
*/
static void
-delay_dht_put_blocks (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+schedule_next_put (struct PutOperator *po)
{
- struct PutOperator *po = cls;
struct GNUNET_TIME_Relative delay;
- po->dht_task = GNUNET_SCHEDULER_NO_TASK;
- if (tc != NULL && 0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
if (po->zero_anonymity_count_estimate > 0)
{
delay =
@@ -125,6 +130,42 @@
/**
+ * Continuation called after DHT PUT operation has finished.
+ *
+ * @param cls type of blocks to gather
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
+ */
+static void
+delay_dht_put_blocks (void *cls, int success)
+{
+ struct PutOperator *po = cls;
+
+ po->dht_put = NULL;
+ schedule_next_put (po);
+}
+
+
+/**
+ * Task that is run periodically to obtain blocks for DHT PUTs.
+ *
+ * @param cls type of blocks to gather
+ * @param tc scheduler context
+ */
+static void
+delay_dht_put_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct PutOperator *po = cls;
+
+ po->dht_task = GNUNET_SCHEDULER_NO_TASK;
+ schedule_next_put (po);
+}
+
+
+/**
* Store content in DHT.
*
* @param cls closure
@@ -151,7 +192,7 @@
{
po->zero_anonymity_count_estimate = po->current_offset - 1;
po->current_offset = 0;
- po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_blocks, po);
+ po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_task, po);
return;
}
po->zero_anonymity_count_estimate =
@@ -159,10 +200,10 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Retrieved block `%s' of type %u for DHT PUT\n", GNUNET_h2s
(key),
type);
- GNUNET_DHT_put (GSF_dht, key, 5 /* DEFAULT_PUT_REPLICATION */ ,
- GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, type, size, data,
- expiration, GNUNET_TIME_UNIT_FOREVER_REL,
- &delay_dht_put_blocks, po);
+ po->dht_put = GNUNET_DHT_put (GSF_dht, key, DEFAULT_PUT_REPLICATION,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, type,
size, data,
+ expiration, GNUNET_TIME_UNIT_FOREVER_REL,
+ &delay_dht_put_blocks, po);
}
@@ -187,7 +228,7 @@
po->dht_put_type,
&process_dht_put_content, po);
if (NULL == po->dht_qe)
- po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_blocks, po);
+ po->dht_task = GNUNET_SCHEDULER_add_now (&delay_dht_put_task, po);
}
@@ -226,6 +267,11 @@
GNUNET_SCHEDULER_cancel (po->dht_task);
po->dht_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if (NULL != po->dht_put)
+ {
+ GNUNET_DHT_put_cancel (po->dht_put);
+ po->dht_put = NULL;
+ }
if (NULL != po->dht_qe)
{
GNUNET_DATASTORE_cancel (po->dht_qe);
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2012-04-26 16:19:46 UTC (rev 21177)
+++ gnunet/src/gns/gnunet-service-gns.c 2012-04-26 16:56:00 UTC (rev 21178)
@@ -212,10 +212,14 @@
* Continuation for DHT put
*
* @param cls closure
- * @param tc task context
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
*/
static void
-record_dht_put(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+record_dht_put(void *cls, int success)
{
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "put request transmitted\n");
}
@@ -334,7 +338,7 @@
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"DHT req to %d\n", DHT_OPERATION_TIMEOUT.rel_value);
-
+ /* FIXME: keep return value to possibly cancel? */
GNUNET_DHT_put (dht_handle, &xor_hash,
DHT_GNS_REPLICATION_LEVEL,
GNUNET_DHT_RO_NONE,
Modified: gnunet/src/include/gnunet_dht_service.h
===================================================================
--- gnunet/src/include/gnunet_dht_service.h 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/include/gnunet_dht_service.h 2012-04-26 16:56:00 UTC (rev
21178)
@@ -121,7 +121,29 @@
/* *************** Standard API: get and put ******************* */
+
/**
+ * Opaque handle to cancel a PUT operation.
+ */
+struct GNUNET_DHT_PutHandle;
+
+
+/**
+ * Type of a PUT continuation. You must not call
+ * "GNUNET_DHT_disconnect" in this continuation.
+ *
+ * @param cls closure
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
+ */
+typedef void (*GNUNET_DHT_PutContinuation)(void *cls,
+ int success);
+
+
+/**
* Perform a PUT operation storing data in the DHT.
*
* @param handle handle to DHT service
@@ -135,20 +157,38 @@
* @param exp desired expiration time for the value
* @param timeout how long to wait for transmission of this request
* @param cont continuation to call when done (transmitting request to service)
- * You must not call GNUNET_DHT_DISCONNECT in this continuation
+ * You must not call "GNUNET_DHT_disconnect" in this continuation
* @param cont_cls closure for cont
+ * @return handle to cancel the "PUT" operation, NULL on error
+ * (size too big)
*/
-void
+struct GNUNET_DHT_PutHandle *
GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, const GNUNET_HashCode * key,
uint32_t desired_replication_level,
enum GNUNET_DHT_RouteOption options,
enum GNUNET_BLOCK_Type type, size_t size, const char *data,
struct GNUNET_TIME_Absolute exp,
- struct GNUNET_TIME_Relative timeout, GNUNET_SCHEDULER_Task
cont,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_DHT_PutContinuation cont,
void *cont_cls);
/**
+ * Cancels a DHT PUT operation. Note that the PUT request may still
+ * go out over the network (we can't stop that); However, if the PUT
+ * has not yet been sent to the service, cancelling the PUT will stop
+ * this from happening (but there is no way for the user of this API
+ * to tell if that is the case). The only use for this API is to
+ * prevent a later call to 'cont' from "GNUNET_DHT_put" (i.e. because
+ * the system is shutting down).
+ *
+ * @param ph put operation to cancel ('cont' will no longer be called)
+ */
+void
+GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph);
+
+
+/**
* Iterator called on each result obtained for a DHT
* operation that expects a reply
*
Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/include/gnunet_protocols.h 2012-04-26 16:56:00 UTC (rev
21178)
@@ -553,7 +553,12 @@
*/
#define GNUNET_MESSAGE_TYPE_DHT_MONITOR_STOP 154
+/**
+ * Acknowledge receiving PUT request
+ */
+#define GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK 155
+
/*******************************************************************************
* HOSTLIST message types
******************************************************************************/
Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c 2012-04-26 16:19:46 UTC (rev
21177)
+++ gnunet/src/mesh/gnunet-service-mesh.c 2012-04-26 16:56:00 UTC (rev
21178)
@@ -474,18 +474,18 @@
/**
* GNUNET_SCHEDULER_Task for printing a message after some operation is done
* @param cls string to print
- * @param tc task context
+ * @param success GNUNET_OK if the PUT was transmitted,
+ * GNUNET_NO on timeout,
+ * GNUNET_SYSERR on disconnect from service
+ * after the PUT message was transmitted
+ * (so we don't know if it was received or not)
*/
static void
-mesh_debug (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+mesh_debug (void *cls, int success)
{
char *s = cls;
- if (NULL != tc && GNUNET_SCHEDULER_REASON_SHUTDOWN == tc->reason)
- {
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s\n", s);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%s (%d)\n", s, success);
}
#endif
@@ -622,6 +622,7 @@
announce_application (void *cls, const GNUNET_HashCode * key, void *value)
{
/* FIXME are hashes in multihash map equal on all aquitectures? */
+ /* FIXME: keep return value of 'put' to possibly cancel!? */
GNUNET_DHT_put (dht_handle, key, 10U,
GNUNET_DHT_RO_RECORD_ROUTE |
GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE, GNUNET_BLOCK_TYPE_TEST,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21178 - in gnunet/src: dht fs gns include mesh,
gnunet <=