};
+#if ENABLE_MALICIOUS
+/**
+ * Handle to act malicious message
+ */
+struct GNUNET_DHT_ActMaliciousHandle
+{
+ /**
+ * Continuation to call when done.
+ */
+ GNUNET_DHT_ActMaliciousContinuation cont;
+
+ /**
+ * Main handle to this DHT api
+ */
+ struct GNUNET_DHT_Handle *dht_handle;
+
+ /**
+ * Closure for 'cont'.
+ */
+ void *cont_cls;
+};
+#endif
/**
* Handle to a PUT request.
GNUNET_DHT_PutContinuation cont;
/**
- * Pending message associated with this PUT operation,
+ * Pending message associated with this PUT operation,
* NULL after the message has been transmitted to the service.
*/
struct PendingMessage *pending;
};
-
-
/**
* Handle to a GET request
*/
/**
* Key that this get request is for
*/
- struct GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
/**
* Unique identifier for this request (for key collisions).
unsigned int seen_results_end;
/**
- * Offset into the 'seen_results' array marking the
+ * Offset into the 'seen_results' array marking the
* position up to where we've send the hash codes to
* the DHT for blocking (needed as we might not be
* able to send all hash codes at once).
* DLL.
*/
struct GNUNET_DHT_MonitorHandle *prev;
-
+
/**
* Main handle to this DHT api.
*/
* Closure for cb.
*/
void *cb_cls;
-
+
};
struct PendingMessage *pending_tail;
/**
- * Head of linked list of messages we would like to monitor.
+ * Head of linked list of messages we would like to monitor.
*/
struct GNUNET_DHT_MonitorHandle *monitor_head;
* Did we start our receive loop yet?
*/
int in_receive;
+
+#if ENABLE_MALICIOUS
+ /**
+ * Handle of act malicious request.
+ */
+ struct GNUNET_DHT_ActMaliciousHandle *mh;
+#endif
};
* @param msg the incoming message
*/
static void
-service_message_handler (void *cls,
+service_message_handler (void *cls,
const struct GNUNET_MessageHeader *msg);
if (delta > max)
delta = max;
msize = sizeof (struct GNUNET_DHT_ClientGetResultSeenMessage) + delta * sizeof (struct GNUNET_HashCode);
-
+
pm = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
msg = (struct GNUNET_DHT_ClientGetResultSeenMessage *) &pm[1];
pm->msg = &msg->header;
get_handle->seen_results_transmission_offset += delta;
GNUNET_CONTAINER_DLL_insert_tail (get_handle->dht_handle->pending_head,
get_handle->dht_handle->pending_tail,
- pm);
+ pm);
}
}
* @return #GNUNET_YES (always)
*/
static int
-add_request_to_pending (void *cls,
- const struct GNUNET_HashCode *key,
+add_request_to_pending (void *cls,
+ const struct GNUNET_HashCode *key,
void *value)
{
struct GNUNET_DHT_Handle *handle = cls;
* @param tc scheduler context
*/
static void
-try_reconnect (void *cls,
+try_reconnect (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_DHT_Handle *handle = cls;
* @return number of bytes written to @a buf
*/
static size_t
-transmit_pending (void *cls,
- size_t size,
+transmit_pending (void *cls,
+ size_t size,
void *buf);
* @return number of bytes written to @a buf
*/
static size_t
-transmit_pending (void *cls,
- size_t size,
+transmit_pending (void *cls,
+ size_t size,
void *buf)
{
struct GNUNET_DHT_Handle *handle = cls;
struct PendingMessage *head;
size_t tsize;
+
handle->th = NULL;
if (NULL == buf)
- {
+ {
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Transmission to DHT service failed! Reconnecting!\n");
do_disconnect (handle);
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting to process replies from DHT\n");
handle->in_receive = GNUNET_YES;
+
GNUNET_CLIENT_receive (handle->client, &service_message_handler, handle,
GNUNET_TIME_UNIT_FOREVER_REL);
}
* #GNUNET_NO if the reply is malformed or we found a matching request
*/
static int
-process_reply (void *cls,
- const struct GNUNET_HashCode *key,
+process_reply (void *cls,
+ const struct GNUNET_HashCode *key,
void *value)
{
const struct GNUNET_DHT_ClientResultMessage *dht_msg = cls;
data = &get_path[get_path_length];
/* remember that we've seen this result */
GNUNET_CRYPTO_hash (data, data_length, &hc);
- if (get_handle->seen_results_size == get_handle->seen_results_end)
+ if (get_handle->seen_results_size == get_handle->seen_results_end)
GNUNET_array_grow (get_handle->seen_results,
get_handle->seen_results_size,
get_handle->seen_results_size * 2 + 1);
GNUNET_assert (get_handle->seen_results_end == get_handle->seen_results_transmission_offset);
get_handle->seen_results[get_handle->seen_results_end++] = hc;
/* no need to block it explicitly, service already knows about it! */
- get_handle->seen_results_transmission_offset++;
+ get_handle->seen_results_transmission_offset++;
get_handle->iter (get_handle->iter_cls,
GNUNET_TIME_absolute_ntoh (dht_msg->expiration), key,
get_path, get_path_length, put_path, put_path_length,
ntohl (msg->desired_replication_level),
ntohl (msg->get_path_length),
(struct GNUNET_PeerIdentity *) &msg[1],
- &msg->key);
+ &msg->key);
}
return GNUNET_OK;
}
}
+#if ENABLE_MALICIOUS
+/**
+ * Process a act malicious confirmation from service.
+ * @param handle The DHT handle.
+ * @param msg confirmation message from the service.
+ * @return #GNUNET_OK if everything went fine,
+ * #GNUNET_SYSERR if the message is malformed.
+ */
+static int
+process_act_malicious_confirmation_message (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_DHT_ClientActMaliciousConfirmationMessage *msg)
+{
+ struct GNUNET_DHT_ActMaliciousHandle *mh;
+ GNUNET_DHT_PutContinuation cont;
+ void *cont_cls;
+
+ mh = handle->mh;
+ if (NULL == mh)
+ return GNUNET_OK;
+ cont = mh->cont;
+ cont_cls = mh->cont_cls;
+ if (NULL != cont)
+ cont (cont_cls, GNUNET_OK);
+
+ return GNUNET_OK;
+}
+#endif
+
+
/**
* Process a put confirmation message from the service.
*
cont = ph->cont;
cont_cls = ph->cont_cls;
GNUNET_DHT_put_cancel (ph);
- if (NULL != cont)
+ if (NULL != cont)
cont (cont_cls, GNUNET_OK);
return GNUNET_OK;
}
uint16_t msize;
int ret;
+
if (NULL == msg)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
ret = process_put_confirmation_message (handle,
(const struct GNUNET_DHT_ClientPutConfirmationMessage*) msg);
break;
+#if ENABLE_MALICIOUS
+ case GNUNET_MESSAGE_TYPE_DHT_CLIENT_ACT_MALICIOUS_OK:
+ if(msize != sizeof (struct GNUNET_DHT_ClientActMaliciousConfirmationMessage))
+ {
+ GNUNET_break (0);
+ break;
+ }
+ ret = process_act_malicious_confirmation_message (handle,
+ (const struct GNUNET_DHT_ClientActMaliciousConfirmationMessage*) msg);
+ break;
+#endif
default:
GNUNET_break(0);
LOG (GNUNET_ERROR_TYPE_WARNING,
handle->cfg = cfg;
handle->uid_gen =
GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
- handle->active_requests = GNUNET_CONTAINER_multihashmap_create (ht_len, GNUNET_NO);
+ handle->active_requests = GNUNET_CONTAINER_multihashmap_create (ht_len, GNUNET_YES);
if (GNUNET_NO == try_connect (handle))
{
GNUNET_DHT_disconnect (handle);
* @param cont_cls closure for @a cont
*/
struct GNUNET_DHT_PutHandle *
-GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
- const struct GNUNET_HashCode * key,
+GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle,
+ const struct GNUNET_HashCode * key,
uint32_t desired_replication_level,
enum GNUNET_DHT_RouteOption options,
- enum GNUNET_BLOCK_Type type, size_t size,
- const void *data,
+ enum GNUNET_BLOCK_Type type, size_t size,
+ const void *data,
struct GNUNET_TIME_Absolute exp,
struct GNUNET_TIME_Relative timeout,
- GNUNET_DHT_PutContinuation cont,
+ GNUNET_DHT_PutContinuation cont,
void *cont_cls)
{
struct GNUNET_DHT_ClientPutMessage *put_msg;
* 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
+ * 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).
*
pending);
pending->in_pending_queue = GNUNET_YES;
get_handle = GNUNET_new (struct GNUNET_DHT_GetHandle);
+ get_handle->key = *key;
get_handle->dht_handle = handle;
get_handle->iter = iter;
get_handle->iter_cls = iter_cls;
get_handle->message = pending;
get_handle->unique_id = get_msg->unique_id;
- GNUNET_CONTAINER_multihashmap_put (handle->active_requests, key, get_handle,
+ GNUNET_CONTAINER_multihashmap_put (handle->active_requests,
+ &get_handle->key,
+ get_handle,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
process_pending_messages (handle);
return get_handle;
unsigned int needed;
needed = get_handle->seen_results_end + num_results;
- if (needed > get_handle->seen_results_size)
+ if (needed > get_handle->seen_results_size)
GNUNET_array_grow (get_handle->seen_results,
get_handle->seen_results_size,
needed);
/* remove 'GET' from active status */
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (handle->active_requests,
- &get_msg->key,
+ &get_handle->key,
get_handle));
if (GNUNET_YES == get_handle->message->in_pending_queue)
{
h->dht_handle = handle;
if (NULL != key)
{
- h->key = GNUNET_new(struct GNUNET_HashCode);
+ h->key = GNUNET_new (struct GNUNET_HashCode);
*h->key = *key;
}
m->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_MONITOR_STOP);
m->header.size = htons (sizeof (struct GNUNET_DHT_MonitorStartStopMessage));
m->type = htonl(handle->type);
- m->get = htons(NULL != handle->get_cb);
+ m->get = htons (NULL != handle->get_cb);
m->get_resp = htons(NULL != handle->get_resp_cb);
- m->put = htons(NULL != handle->put_cb);
- if (NULL != handle->key) {
- m->filter_key = htons(1);
- memcpy (&m->key, handle->key, sizeof(struct GNUNET_HashCode));
+ m->put = htons (NULL != handle->put_cb);
+ if (NULL != handle->key)
+ {
+ m->filter_key = htons (1);
+ m->key = *handle->key;
}
GNUNET_CONTAINER_DLL_insert (handle->dht_handle->pending_head,
handle->dht_handle->pending_tail,
pending);
pending->in_pending_queue = GNUNET_YES;
process_pending_messages (handle->dht_handle);
-
+
GNUNET_free_non_null (handle->key);
GNUNET_free (handle);
}
+
+#if ENABLE_MALICIOUS
+/**
+ * Turn the DHT service to act malicious.
+ *
+ * @param handle the DHT handle
+ * @param action 1 to make the service malicious; 0 to make it benign
+ * @param cont continuation to call when done (transmitting request to service)
+ * @param cont_cls closure for @a cont
+ */
+struct GNUNET_DHT_ActMaliciousHandle *
+GNUNET_DHT_act_malicious (struct GNUNET_DHT_Handle *handle,
+ unsigned int action,
+ GNUNET_DHT_PutContinuation cont,
+ void *cont_cls)
+{
+ struct GNUNET_DHT_ActMaliciousMessage *amm;
+ struct GNUNET_DHT_ActMaliciousHandle *mh;
+ struct PendingMessage *pending;
+ size_t msize;
+
+ msize = sizeof(struct GNUNET_DHT_ActMaliciousMessage);
+ if (msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
+ {
+ GNUNET_break(0);
+ return NULL;
+ }
+ mh = GNUNET_new (struct GNUNET_DHT_ActMaliciousHandle);
+ mh->dht_handle = handle;
+ mh->cont = cont;
+ mh->cont_cls = cont_cls;
+ pending = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ amm = (struct GNUNET_DHT_ActMaliciousMessage *)&pending[1];
+ pending->msg = &amm->header;
+ pending->handle = handle;
+ pending->free_on_send = GNUNET_YES;
+ amm->header.size = htons (msize);
+ amm->header.type = htons (GNUNET_MESSAGE_TYPE_DHT_ACT_MALICIOUS);
+ amm->action = action;
+ handle->mh = mh;
+ GNUNET_CONTAINER_DLL_insert (handle->pending_head, handle->pending_tail,
+ pending);
+ pending->in_pending_queue = GNUNET_YES;
+ process_pending_messages (handle);
+ return mh;
+}
+#endif
+
+
/* end of dht_api.c */
projects / oweals / gnunet.git / blobdiff