#include "platform.h"
#include "gnunet_util_lib.h"
#include "peerstore.h"
+#include "peerstore_common.h"
#define LOG(kind,...) GNUNET_log_from (kind, "peerstore-api",__VA_ARGS__)
*/
struct GNUNET_CLIENT_Connection *client;
+ /**
+ * Message queue
+ */
+ struct GNUNET_MQ_Handle *mq;
+
+ /**
+ * Head of active STORE requests.
+ */
+ struct GNUNET_PEERSTORE_StoreContext *store_head;
+
+ /**
+ * Tail of active STORE requests.
+ */
+ struct GNUNET_PEERSTORE_StoreContext *store_tail;
+
+ /**
+ * Head of active ITERATE requests.
+ */
+ struct GNUNET_PEERSTORE_IterateContext *iterate_head;
+
+ /**
+ * Tail of active ITERATE requests.
+ */
+ struct GNUNET_PEERSTORE_IterateContext *iterate_tail;
+
+ /**
+ * Hashmap of watch requests
+ */
+ struct GNUNET_CONTAINER_MultiHashMap *watches;
+
};
/**
*/
struct GNUNET_PEERSTORE_StoreContext
{
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_StoreContext *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_StoreContext *prev;
/**
* Handle to the PEERSTORE service.
*/
struct GNUNET_PEERSTORE_Handle *h;
+ /**
+ * MQ Envelope with store request message
+ */
+ struct GNUNET_MQ_Envelope *ev;
+
/**
* Continuation called with service response
*/
};
+/**
+ * Context for a iterate request
+ */
+struct GNUNET_PEERSTORE_IterateContext
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_IterateContext *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_IterateContext *prev;
+
+ /**
+ * Handle to the PEERSTORE service.
+ */
+ struct GNUNET_PEERSTORE_Handle *h;
+
+ /**
+ * MQ Envelope with iterate request message
+ */
+ struct GNUNET_MQ_Envelope *ev;
+
+ /**
+ * Callback with each matching record
+ */
+ GNUNET_PEERSTORE_Processor callback;
+
+ /**
+ * Closure for 'callback'
+ */
+ void *callback_cls;
+
+ /**
+ * #GNUNET_YES / #GNUNET_NO
+ * if sent, cannot be canceled
+ */
+ int request_sent;
+
+ /**
+ * Task identifier for the function called
+ * on iterate request timeout
+ */
+ GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+};
+
+/**
+ * Context for a watch request
+ */
+struct GNUNET_PEERSTORE_WatchContext
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_WatchContext *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct GNUNET_PEERSTORE_WatchContext *prev;
+
+ /**
+ * Handle to the PEERSTORE service.
+ */
+ struct GNUNET_PEERSTORE_Handle *h;
+
+ /**
+ * MQ Envelope with watch request message
+ */
+ struct GNUNET_MQ_Envelope *ev;
+
+ /**
+ * Callback with each record received
+ */
+ GNUNET_PEERSTORE_Processor callback;
+
+ /**
+ * Closure for 'callback'
+ */
+ void *callback_cls;
+
+ /**
+ * Hash of the combined key
+ */
+ struct GNUNET_HashCode keyhash;
+
+ /**
+ * #GNUNET_YES / #GNUNET_NO
+ * if sent, cannot be canceled
+ */
+ int request_sent;
+
+};
+
+/******************************************************************************/
+/******************* DECLARATIONS *********************/
+/******************************************************************************/
+
+/**
+ * When a response for iterate request is received
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_Handle *'
+ * @param msg message received, NULL on timeout or fatal error
+ */
+void handle_iterate_result (void *cls, const struct GNUNET_MessageHeader *msg);
+
+/**
+ * When a watch record is received
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_Handle *'
+ * @param msg message received, NULL on timeout or fatal error
+ */
+void handle_watch_result (void *cls, const struct GNUNET_MessageHeader *msg);
+
+/**
+ * Close the existing connection to PEERSTORE and reconnect.
+ *
+ * @param h handle to the service
+ */
+static void
+reconnect (struct GNUNET_PEERSTORE_Handle *h);
+
+/**
+ * Callback after MQ envelope is sent
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_WatchContext *'
+ */
+void watch_request_sent (void *cls);
+
+/**
+ * Callback after MQ envelope is sent
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_IterateContext *'
+ */
+void iterate_request_sent (void *cls);
+
+/**
+ * Callback after MQ envelope is sent
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_StoreContext *'
+ */
+void store_request_sent (void *cls);
+
+/**
+ * MQ message handlers
+ */
+static const struct GNUNET_MQ_MessageHandler mq_handlers[] = {
+ {&handle_iterate_result, GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_RECORD, 0},
+ {&handle_iterate_result, GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END, sizeof(struct GNUNET_MessageHeader)},
+ {&handle_watch_result, GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH_RECORD, 0},
+ GNUNET_MQ_HANDLERS_END
+};
+
/******************************************************************************/
/******************* CONNECTION FUNCTIONS *********************/
/******************************************************************************/
+static void
+handle_client_error (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_PEERSTORE_Handle *h = cls;
+
+ LOG(GNUNET_ERROR_TYPE_ERROR, "Received an error notification from MQ of type: %d\n", error);
+ reconnect(h);
+}
+
+/**
+ * Iterator over previous watches to resend them
+ */
+int rewatch_it(void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_PEERSTORE_Handle *h = cls;
+ struct GNUNET_PEERSTORE_WatchContext *wc = value;
+ struct StoreKeyHashMessage *hm;
+
+ if(GNUNET_YES == wc->request_sent)
+ { /* Envelope gone, create new one. */
+ wc->ev = GNUNET_MQ_msg(hm, GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH);
+ hm->keyhash = wc->keyhash;
+ wc->request_sent = GNUNET_NO;
+ }
+ GNUNET_MQ_notify_sent(wc->ev, &watch_request_sent, wc);
+ GNUNET_MQ_send(h->mq, wc->ev);
+ return GNUNET_YES;
+}
+
/**
* Close the existing connection to PEERSTORE and reconnect.
*
static void
reconnect (struct GNUNET_PEERSTORE_Handle *h)
{
+ struct GNUNET_PEERSTORE_IterateContext *ic;
+ GNUNET_PEERSTORE_Processor icb;
+ void *icb_cls;
+ struct GNUNET_PEERSTORE_StoreContext *sc;
LOG(GNUNET_ERROR_TYPE_DEBUG, "Reconnecting...\n");
+ if (NULL != h->mq)
+ {
+ GNUNET_MQ_destroy(h->mq);
+ h->mq = NULL;
+ }
if (NULL != h->client)
{
GNUNET_CLIENT_disconnect (h->client);
h->client = NULL;
}
h->client = GNUNET_CLIENT_connect ("peerstore", h->cfg);
-
+ GNUNET_assert(NULL != h->client);
+ h->mq = GNUNET_MQ_queue_for_connection_client(h->client,
+ mq_handlers,
+ &handle_client_error,
+ h);
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "Resending pending requests after reconnect.\n");
+ if (NULL != h->watches)
+ {
+ GNUNET_CONTAINER_multihashmap_iterate(h->watches,
+ &rewatch_it, h);
+ }
+ ic = h->iterate_head;
+ while (NULL != ic)
+ {
+ if (GNUNET_YES == ic->request_sent)
+ {
+ icb = ic->callback;
+ icb_cls = ic->callback_cls;
+ GNUNET_PEERSTORE_iterate_cancel(ic);
+ if(NULL != icb)
+ icb(icb_cls, NULL,_("Iteration canceled due to reconnection."));
+ }
+ else
+ {
+ GNUNET_MQ_notify_sent(ic->ev, &iterate_request_sent, ic);
+ GNUNET_MQ_send(h->mq, ic->ev);
+ }
+ ic = ic->next;
+ }
+ sc = h->store_head;
+ while (NULL != sc)
+ {
+ GNUNET_MQ_notify_sent(sc->ev, &store_request_sent, sc);
+ GNUNET_MQ_send(h->mq, sc->ev);
+ sc = sc->next;
+ }
}
/**
struct GNUNET_PEERSTORE_Handle *
GNUNET_PEERSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_CLIENT_Connection *client;
struct GNUNET_PEERSTORE_Handle *h;
- client = GNUNET_CLIENT_connect ("peerstore", cfg);
- if(NULL == client)
- return NULL;
h = GNUNET_new (struct GNUNET_PEERSTORE_Handle);
- h->client = client;
+ h->client = GNUNET_CLIENT_connect ("peerstore", cfg);
+ if(NULL == h->client)
+ {
+ GNUNET_free(h);
+ return NULL;
+ }
h->cfg = cfg;
+ h->mq = GNUNET_MQ_queue_for_connection_client(h->client,
+ mq_handlers,
+ &handle_client_error,
+ h);
+ if(NULL == h->mq)
+ {
+ GNUNET_free(h);
+ return NULL;
+ }
LOG(GNUNET_ERROR_TYPE_DEBUG, "New connection created\n");
return h;
}
void
GNUNET_PEERSTORE_disconnect(struct GNUNET_PEERSTORE_Handle *h)
{
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Disconnecting.\n");
+ if(NULL != h->watches)
+ {
+ GNUNET_CONTAINER_multihashmap_destroy(h->watches);
+ h->watches = NULL;
+ }
+ if(NULL != h->mq)
+ {
+ GNUNET_MQ_destroy(h->mq);
+ h->mq = NULL;
+ }
if (NULL != h->client)
{
GNUNET_CLIENT_disconnect (h->client);
/******************************************************************************/
-/******************* ADD FUNCTIONS *********************/
+/******************* STORE FUNCTIONS *********************/
/******************************************************************************/
/**
- * When a response for store request is received
+ * Callback after MQ envelope is sent
*
* @param cls a 'struct GNUNET_PEERSTORE_StoreContext *'
- * @param msg message received, NULL on timeout or fatal error
*/
-void store_response_receiver (void *cls, const struct GNUNET_MessageHeader *msg)
+void store_request_sent (void *cls)
{
struct GNUNET_PEERSTORE_StoreContext *sc = cls;
- uint16_t msg_type;
-
- if(NULL == sc->cont)
- return;
- if(NULL == msg)
- {
- sc->cont(sc->cont_cls, GNUNET_SYSERR);
- reconnect(sc->h);
- return;
- }
- msg_type = ntohs(msg->type);
- if(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE_RESULT_OK == msg_type)
- sc->cont(sc->cont_cls, GNUNET_OK);
- else if(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE_RESULT_FAIL == msg_type)
- sc->cont(sc->cont_cls, GNUNET_SYSERR);
- else
- {
- LOG(GNUNET_ERROR_TYPE_ERROR, "Invalid response from `PEERSTORE' service.\n");
- sc->cont(sc->cont_cls, GNUNET_SYSERR);
- }
+ GNUNET_PEERSTORE_Continuation cont;
+ void *cont_cls;
+ sc->ev = NULL;
+ cont = sc->cont;
+ cont_cls = sc->cont_cls;
+ GNUNET_PEERSTORE_store_cancel(sc);
+ if(NULL != cont)
+ cont(cont_cls, GNUNET_OK);
}
/**
void
GNUNET_PEERSTORE_store_cancel (struct GNUNET_PEERSTORE_StoreContext *sc)
{
- sc->cont = NULL;
+ if(NULL != sc->ev)
+ {
+ GNUNET_MQ_send_cancel(sc->ev);
+ sc->ev = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove(sc->h->store_head, sc->h->store_tail, sc);
+ GNUNET_free(sc);
}
/**
- * Store a new entry in the PEERSTORE
+ * Store a new entry in the PEERSTORE.
+ * Note that stored entries can be lost in some cases
+ * such as power failure.
*
* @param h Handle to the PEERSTORE service
* @param sub_system name of the sub system
* @param key entry key
* @param value entry value BLOB
* @param size size of 'value'
- * @param lifetime relative time after which the entry is (possibly) deleted
+ * @param expiry absolute time after which the entry is (possibly) deleted
* @param cont Continuation function after the store request is processed
* @param cont_cls Closure for 'cont'
*/
const char *key,
const void *value,
size_t size,
- struct GNUNET_TIME_Relative lifetime,
+ struct GNUNET_TIME_Absolute expiry,
+ enum GNUNET_PEERSTORE_StoreOption options,
GNUNET_PEERSTORE_Continuation cont,
void *cont_cls)
{
+ struct GNUNET_MQ_Envelope *ev;
struct GNUNET_PEERSTORE_StoreContext *sc;
- struct StoreRequestMessage *srm;
- size_t ss_size;
- size_t key_size;
- size_t request_size;
- void *dummy;
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Storing value (size: %lu) for subsytem `%s', peer `%s', key `%s'\n",
size, sub_system, GNUNET_i2s (peer), key);
+ ev = PEERSTORE_create_record_mq_envelope(sub_system,
+ peer,
+ key,
+ value,
+ size,
+ &expiry,
+ options,
+ GNUNET_MESSAGE_TYPE_PEERSTORE_STORE);
sc = GNUNET_new(struct GNUNET_PEERSTORE_StoreContext);
+ sc->ev = ev;
sc->cont = cont;
sc->cont_cls = cont_cls;
sc->h = h;
- ss_size = strlen(sub_system) + 1;
- key_size = strlen(key) + 1;
- request_size = sizeof(struct StoreRequestMessage) +
- ss_size +
- key_size +
- size;
- srm = GNUNET_malloc(request_size);
- srm->header.size = htons(request_size);
- srm->header.type = htons(GNUNET_MESSAGE_TYPE_PEERSTORE_STORE);
- srm->key_size = htons(key_size);
- srm->lifetime = lifetime;
- srm->peer = *peer;
- srm->sub_system_size = htons(ss_size);
- srm->value_size = htons(size);
- dummy = &srm[1];
- memcpy(dummy, sub_system, ss_size);
- dummy += ss_size;
- memcpy(dummy, key, key_size);
- dummy += key_size;
- memcpy(dummy, value, size);
- GNUNET_CLIENT_transmit_and_get_response(h->client,
- (const struct GNUNET_MessageHeader *)srm,
- GNUNET_TIME_UNIT_FOREVER_REL,
- GNUNET_YES,
- &store_response_receiver,
- sc);
+ GNUNET_CONTAINER_DLL_insert_tail(h->store_head, h->store_tail, sc);
+ GNUNET_MQ_notify_sent(ev, &store_request_sent, sc);
+ GNUNET_MQ_send(h->mq, ev);
return sc;
}
+/******************************************************************************/
+/******************* ITERATE FUNCTIONS *********************/
+/******************************************************************************/
+
+/**
+ * When a response for iterate request is received
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_Handle *'
+ * @param msg message received, NULL on timeout or fatal error
+ */
+void handle_iterate_result (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_PEERSTORE_Handle *h = cls;
+ struct GNUNET_PEERSTORE_IterateContext *ic;
+ GNUNET_PEERSTORE_Processor callback;
+ void *callback_cls;
+ uint16_t msg_type;
+ struct GNUNET_PEERSTORE_Record *record;
+ int continue_iter;
+
+ ic = h->iterate_head;
+ if(NULL == ic)
+ {
+ LOG(GNUNET_ERROR_TYPE_ERROR, "Unexpected iteration response, this should not happen.\n");
+ reconnect(h);
+ return;
+ }
+ callback = ic->callback;
+ callback_cls = ic->callback_cls;
+ if(NULL == msg) /* Connection error */
+ {
+
+ if(NULL != callback)
+ callback(callback_cls, NULL,
+ _("Error communicating with `PEERSTORE' service."));
+ reconnect(h);
+ return;
+ }
+ msg_type = ntohs(msg->type);
+ if(GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE_END == msg_type)
+ {
+ ic->request_sent = GNUNET_NO;
+ GNUNET_PEERSTORE_iterate_cancel(ic);
+ if(NULL != callback)
+ callback(callback_cls, NULL, NULL);
+ return;
+ }
+ if(NULL != callback)
+ {
+ record = PEERSTORE_parse_record_message(msg);
+ if(NULL == record)
+ continue_iter = callback(callback_cls, NULL, _("Received a malformed response from service."));
+ else
+ {
+ continue_iter = callback(callback_cls, record, NULL);
+ PEERSTORE_destroy_record(record);
+ }
+ if(GNUNET_NO == continue_iter)
+ ic->callback = NULL;
+ }
+
+}
+
+/**
+ * Callback after MQ envelope is sent
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_IterateContext *'
+ */
+void iterate_request_sent (void *cls)
+{
+ struct GNUNET_PEERSTORE_IterateContext *ic = cls;
+
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Iterate request sent to service.\n");
+ ic->request_sent = GNUNET_YES;
+ ic->ev = NULL;
+}
+
+/**
+ * Called when the iterate request is timedout
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_IterateContext *'
+ */
+void iterate_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_PEERSTORE_IterateContext *ic = cls;
+
+ ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_PEERSTORE_iterate_cancel(ic);
+}
+
+/**
+ * Cancel an iterate request
+ * Please do not call after the iterate request is done
+ *
+ * @param ic Iterate request context as returned by GNUNET_PEERSTORE_iterate()
+ */
+void
+GNUNET_PEERSTORE_iterate_cancel (struct GNUNET_PEERSTORE_IterateContext *ic)
+{
+ if(GNUNET_SCHEDULER_NO_TASK != ic->timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel(ic->timeout_task);
+ ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if(GNUNET_NO == ic->request_sent)
+ {
+ if(NULL != ic->ev)
+ {
+ GNUNET_MQ_send_cancel(ic->ev);
+ ic->ev = NULL;
+ }
+ GNUNET_CONTAINER_DLL_remove(ic->h->iterate_head, ic->h->iterate_tail, ic);
+ GNUNET_free(ic);
+ }
+ else
+ ic->callback = NULL;
+}
+
+/**
+ * Iterate over records matching supplied key information
+ *
+ * @param h handle to the PEERSTORE service
+ * @param sub_system name of sub system
+ * @param peer Peer identity (can be NULL)
+ * @param key entry key string (can be NULL)
+ * @param timeout time after which the iterate request is canceled
+ * @param callback function called with each matching record, all NULL's on end
+ * @param callback_cls closure for @a callback
+ * @return Handle to iteration request
+ */
+struct GNUNET_PEERSTORE_IterateContext *
+GNUNET_PEERSTORE_iterate (struct GNUNET_PEERSTORE_Handle *h,
+ const char *sub_system,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *key,
+ struct GNUNET_TIME_Relative timeout,
+ GNUNET_PEERSTORE_Processor callback, void *callback_cls)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct GNUNET_PEERSTORE_IterateContext *ic;
+
+ ev = PEERSTORE_create_record_mq_envelope(sub_system,
+ peer,
+ key,
+ NULL,
+ 0,
+ NULL,
+ 0,
+ GNUNET_MESSAGE_TYPE_PEERSTORE_ITERATE);
+ ic = GNUNET_new(struct GNUNET_PEERSTORE_IterateContext);
+ ic->callback = callback;
+ ic->callback_cls = callback_cls;
+ ic->ev = ev;
+ ic->h = h;
+ ic->request_sent = GNUNET_NO;
+ GNUNET_CONTAINER_DLL_insert_tail(h->iterate_head, h->iterate_tail, ic);
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "Sending an iterate request for sub system `%s'\n", sub_system);
+ GNUNET_MQ_notify_sent(ev, &iterate_request_sent, ic);
+ GNUNET_MQ_send(h->mq, ev);
+ ic->timeout_task = GNUNET_SCHEDULER_add_delayed(timeout, &iterate_timeout, ic);
+ return ic;
+}
+
+/******************************************************************************/
+/******************* WATCH FUNCTIONS *********************/
+/******************************************************************************/
+
+/**
+ * When a watch record is received
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_Handle *'
+ * @param msg message received, NULL on timeout or fatal error
+ */
+void handle_watch_result (void *cls, const struct GNUNET_MessageHeader *msg)
+{
+ struct GNUNET_PEERSTORE_Handle *h = cls;
+ struct GNUNET_PEERSTORE_Record *record;
+ struct GNUNET_HashCode keyhash;
+ struct GNUNET_PEERSTORE_WatchContext *wc;
+
+ if(NULL == msg)
+ {
+ LOG(GNUNET_ERROR_TYPE_ERROR,
+ "Problem receiving a watch response, no way to determine which request.\n");
+ reconnect(h);
+ return;
+ }
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Received a watch record from service.\n");
+ record = PEERSTORE_parse_record_message(msg);
+ PEERSTORE_hash_key(record->sub_system,
+ record->peer, record->key, &keyhash);
+ wc = GNUNET_CONTAINER_multihashmap_get(h->watches, &keyhash);
+ if(NULL != wc->callback)
+ wc->callback(wc->callback_cls, record, NULL);
+ PEERSTORE_destroy_record(record);
+}
+
+/**
+ * Callback after MQ envelope is sent
+ *
+ * @param cls a 'struct GNUNET_PEERSTORE_WatchContext *'
+ */
+void watch_request_sent (void *cls)
+{
+ struct GNUNET_PEERSTORE_WatchContext *wc = cls;
+
+ wc->request_sent = GNUNET_YES;
+ wc->ev = NULL;
+}
+
+/**
+ * Cancel a watch request
+ *
+ * @wc handle to the watch request
+ */
+void
+GNUNET_PEERSTORE_watch_cancel(struct GNUNET_PEERSTORE_WatchContext *wc)
+{
+ struct GNUNET_PEERSTORE_Handle *h = wc->h;
+ struct GNUNET_MQ_Envelope *ev;
+ struct StoreKeyHashMessage *hm;
+
+ LOG(GNUNET_ERROR_TYPE_DEBUG, "Canceling watch.\n");
+ if(GNUNET_YES == wc->request_sent) /* If request already sent to service, send a cancel request. */
+ {
+ ev = GNUNET_MQ_msg(hm, GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH_CANCEL);
+ GNUNET_MQ_send(h->mq, ev);
+ wc->callback = NULL;
+ wc->callback_cls = NULL;
+ }
+ if(NULL != wc->ev)
+ {
+ GNUNET_MQ_send_cancel(wc->ev);
+ wc->ev = NULL;
+ }
+ GNUNET_CONTAINER_multihashmap_remove(h->watches, &wc->keyhash, wc);
+ GNUNET_free(wc);
+
+}
+
+/**
+ * Request watching a given key
+ * User will be notified with any new values added to key
+ *
+ * @param h handle to the PEERSTORE service
+ * @param sub_system name of sub system
+ * @param peer Peer identity
+ * @param key entry key string
+ * @param callback function called with each new value
+ * @param callback_cls closure for @a callback
+ * @return Handle to watch request
+ */
+struct GNUNET_PEERSTORE_WatchContext *
+GNUNET_PEERSTORE_watch (struct GNUNET_PEERSTORE_Handle *h,
+ const char *sub_system,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *key,
+ GNUNET_PEERSTORE_Processor callback, void *callback_cls)
+{
+ struct GNUNET_MQ_Envelope *ev;
+ struct StoreKeyHashMessage *hm;
+ struct GNUNET_PEERSTORE_WatchContext *wc;
+
+ ev = GNUNET_MQ_msg(hm, GNUNET_MESSAGE_TYPE_PEERSTORE_WATCH);
+ PEERSTORE_hash_key(sub_system, peer, key, &hm->keyhash);
+ wc = GNUNET_new(struct GNUNET_PEERSTORE_WatchContext);
+ wc->callback = callback;
+ wc->callback_cls = callback_cls;
+ wc->ev = ev;
+ wc->h = h;
+ wc->request_sent = GNUNET_NO;
+ wc->keyhash = hm->keyhash;
+ if(NULL == h->watches)
+ h->watches = GNUNET_CONTAINER_multihashmap_create(5, GNUNET_NO);
+ GNUNET_CONTAINER_multihashmap_put(h->watches, &wc->keyhash,
+ wc, GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
+ LOG(GNUNET_ERROR_TYPE_DEBUG,
+ "Sending a watch request for ss `%s', peer `%s', key `%s'.\n",
+ sub_system, GNUNET_i2s(peer), key);
+ GNUNET_MQ_notify_sent(ev, &watch_request_sent, wc);
+ GNUNET_MQ_send(h->mq, ev);
+ return wc;
+}
/* end of peerstore_api.c */