/*
This file is part of GNUnet.
- Copyright (C)
+ Copyright (C)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* The handle to the client configuration.
*/
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
- /**
- * The connection to the client.
- */
- struct GNUNET_CLIENT_Connection *conn;
+ const struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* The message queue to the client.
};
+
+/**
+ * This function is called, when the service replies to our request.
+ * It verifies that @a msg is well-formed.
+ *
+ * @param cls the closure
+ * @param msg the message
+ * @return #GNUNET_OK if @a msg is well-formed
+ */
+static int
+check_reply (void *cls,
+ const struct GNUNET_RPS_CS_ReplyMessage *msg)
+{
+ uint16_t msize = ntohs (msg->header.size);
+ uint32_t num_peers = ntohl (msg->num_peers);
+
+ msize -= sizeof (struct GNUNET_RPS_CS_ReplyMessage);
+ if ( (msize / sizeof (struct GNUNET_PeerIdentity) != num_peers) ||
+ (msize % sizeof (struct GNUNET_PeerIdentity) != 0) )
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
/**
* This function is called, when the service replies to our request.
* It calls the callback the caller gave us with the provided closure
* and disconnects afterwards.
*
* @param cls the closure
- * @param message the message
+ * @param msg the message
*/
- static void
+static void
handle_reply (void *cls,
- const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_RPS_CS_ReplyMessage *msg)
{
- struct GNUNET_RPS_Handle *h = (struct GNUNET_RPS_Handle *) cls;
- struct GNUNET_RPS_CS_ReplyMessage *msg;
+ struct GNUNET_RPS_Handle *h = cls;
struct GNUNET_PeerIdentity *peers;
struct GNUNET_RPS_Request_Handle *rh;
uint32_t id;
/* Give the peers back */
- msg = (struct GNUNET_RPS_CS_ReplyMessage *) message;
id = ntohl (msg->id);
-
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Service replied with %" PRIu32 " peers for id %" PRIu32 "\n",
ntohl (msg->num_peers),
rh = GNUNET_CONTAINER_multihashmap32_get (h->req_handlers, id);
GNUNET_assert (NULL != rh);
GNUNET_CONTAINER_multihashmap32_remove_all (h->req_handlers, id);
- rh->ready_cb((rh)->ready_cb_cls, ntohl (msg->num_peers), peers);
+ rh->ready_cb (rh->ready_cb_cls,
+ ntohl (msg->num_peers),
+ peers);
}
+
/**
* Reconnect to the service
*/
* @param cls the closure
* @param error error code without specyfied meaning
*/
- static void
-mq_error_handler (void *cls, enum GNUNET_MQ_Error error)
+static void
+mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
struct GNUNET_RPS_Handle *h = cls;
//TODO LOG
reconnect (h);
}
+
/**
* Reconnect to the service
*/
static void
reconnect (struct GNUNET_RPS_Handle *h)
{
- static const struct GNUNET_MQ_MessageHandler mq_handlers[] = {
- {&handle_reply, GNUNET_MESSAGE_TYPE_RPS_CS_REPLY, 0},
- GNUNET_MQ_HANDLERS_END
+ struct GNUNET_CLIENT_Connection *conn;
+
+ GNUNET_MQ_hd_var_size (reply,
+ GNUNET_MESSAGE_TYPE_RPS_CS_REPLY,
+ struct GNUNET_RPS_CS_ReplyMessage);
+ struct GNUNET_MQ_MessageHandler mq_handlers[] = {
+ make_reply_handler (h),
+ GNUNET_MQ_handler_end ()
};
if (NULL != h->mq)
GNUNET_MQ_destroy (h->mq);
- if (NULL != h->conn)
- GNUNET_CLIENT_disconnect (h->conn);
- h->conn = GNUNET_CLIENT_connect ("rps", h->cfg);
- GNUNET_assert (NULL != h->conn);
- h->mq = GNUNET_MQ_queue_for_connection_client(h->conn,
- mq_handlers,
- mq_error_handler, // TODO implement
- h);
+ h->mq = GNUNET_CLIENT_connecT (h->cfg,
+ "rps",
+ mq_handlers,
+ &mq_error_handler,
+ h);
}
+
/**
* Connect to the rps service
*
* @param cfg configuration to use
* @return a handle to the service
*/
- struct GNUNET_RPS_Handle *
+struct GNUNET_RPS_Handle *
GNUNET_RPS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_RPS_Handle *h;
- //struct GNUNET_RPS_Request_Handle *rh;
- h = GNUNET_new(struct GNUNET_RPS_Handle);
- h->cfg = GNUNET_CONFIGURATION_dup (cfg);
+ h = GNUNET_new (struct GNUNET_RPS_Handle);
+ h->cfg = cfg;
reconnect (h);
+ if (NULL == h->mq)
+ {
+ GNUNET_free (h);
+ return NULL;
+ }
h->req_handlers = GNUNET_CONTAINER_multihashmap32_create (4);
return h;
}
* @param cls closure given to the callback
* @return a handle to cancel this request
*/
- struct GNUNET_RPS_Request_Handle *
+struct GNUNET_RPS_Request_Handle *
GNUNET_RPS_request_peers (struct GNUNET_RPS_Handle *rps_handle,
uint32_t num_req_peers,
GNUNET_RPS_NotifyReadyCB ready_cb,
* @param n number of peers to seed
* @param ids the ids of the peers seeded
*/
- void
+void
GNUNET_RPS_seed_ids (struct GNUNET_RPS_Handle *h,
uint32_t n,
const struct GNUNET_PeerIdentity *ids)
* if @type is 2 the last id is the id of the
* peer to be isolated from the rest
*/
- void
+void
GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
uint32_t type,
uint32_t num_peers,
*
* @param rh request handle of request to cancle
*/
- void
+void
GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh)
{
struct GNUNET_RPS_Handle *h;
*
* @param h the handle to the rps service
*/
- void
+void
GNUNET_RPS_disconnect (struct GNUNET_RPS_Handle *h)
{
- if (NULL != h->conn)
- GNUNET_CLIENT_disconnect (h->conn);
- GNUNET_CONFIGURATION_destroy (h->cfg);
GNUNET_MQ_destroy (h->mq);
if (0 < GNUNET_CONTAINER_multihashmap32_size (h->req_handlers))
LOG (GNUNET_ERROR_TYPE_WARNING,
projects / oweals / gnunet.git / blobdiff