[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37729 - in gnunet/src: include multicast psyc psycstore ps
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r37729 - in gnunet/src: include multicast psyc psycstore psycutil social |
|
Date: |
Wed, 17 Aug 2016 23:26:41 +0200 |
Author: tg
Date: 2016-08-17 23:26:41 +0200 (Wed, 17 Aug 2016)
New Revision: 37729
Modified:
gnunet/src/include/gnunet_psyc_message.h
gnunet/src/multicast/multicast_api.c
gnunet/src/psyc/psyc_api.c
gnunet/src/psycstore/psycstore_api.c
gnunet/src/psycutil/psyc_message.c
gnunet/src/social/social_api.c
Log:
psyc, social: switch to MQ
Modified: gnunet/src/include/gnunet_psyc_message.h
===================================================================
--- gnunet/src/include/gnunet_psyc_message.h 2016-08-16 22:30:52 UTC (rev
37728)
+++ gnunet/src/include/gnunet_psyc_message.h 2016-08-17 21:26:41 UTC (rev
37729)
@@ -107,7 +107,7 @@
* Create a transmission handle.
*/
struct GNUNET_PSYC_TransmitHandle *
-GNUNET_PSYC_transmit_create ();
+GNUNET_PSYC_transmit_create (struct GNUNET_MQ_Handle *mq);
/**
Modified: gnunet/src/multicast/multicast_api.c
===================================================================
--- gnunet/src/multicast/multicast_api.c 2016-08-16 22:30:52 UTC (rev
37728)
+++ gnunet/src/multicast/multicast_api.c 2016-08-17 21:26:41 UTC (rev
37729)
@@ -76,6 +76,11 @@
struct GNUNET_MQ_Handle *mq;
/**
+ * Message to send on connect.
+ */
+ struct GNUNET_MQ_Envelope *connect_env;
+
+ /**
* Time to wait until we try to reconnect on failure.
*/
struct GNUNET_TIME_Relative reconnect_delay;
@@ -85,11 +90,6 @@
*/
struct GNUNET_SCHEDULER_Task *reconnect_task;
- /**
- * Message to send on connect.
- */
- struct GNUNET_MQ_Envelope *connect_env;
-
GNUNET_MULTICAST_JoinRequestCallback join_req_cb;
GNUNET_MULTICAST_ReplayFragmentCallback replay_frag_cb;
GNUNET_MULTICAST_ReplayMessageCallback replay_msg_cb;
@@ -522,7 +522,7 @@
static void
group_cleanup (struct GNUNET_MULTICAST_Group *grp)
{
- GNUNET_free (grp->connect_env);
+ GNUNET_MQ_discard (grp->connect_env);
if (NULL != grp->disconnect_cb)
grp->disconnect_cb (grp->disconnect_cls);
}
@@ -724,7 +724,7 @@
}
grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_delay,
- &origin_reconnect,
+ origin_reconnect,
orig);
grp->reconnect_delay = GNUNET_TIME_STD_BACKOFF (grp->reconnect_delay);
}
@@ -829,10 +829,11 @@
grp->connect_env = GNUNET_MQ_msg (start,
GNUNET_MESSAGE_TYPE_MULTICAST_ORIGIN_START);
start->max_fragment_id = max_fragment_id;
- GNUNET_memcpy (&start->group_key, priv_key, sizeof (*priv_key));
+ start->group_key = *priv_key;
+ grp->cfg = cfg;
grp->is_origin = GNUNET_YES;
- grp->cfg = cfg;
+ grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
grp->cb_cls = cls;
grp->join_req_cb = join_request_cb;
@@ -1024,7 +1025,7 @@
grp->mq = NULL;
grp->reconnect_task = GNUNET_SCHEDULER_add_delayed (grp->reconnect_delay,
- &member_reconnect,
+ member_reconnect,
mem);
grp->reconnect_delay = GNUNET_TIME_STD_BACKOFF (grp->reconnect_delay);
}
@@ -1162,9 +1163,9 @@
if (0 < join_msg_size)
GNUNET_memcpy (((char *) &join[1]) + relay_size, join_msg, join_msg_size);
+ grp->cfg = cfg;
+ grp->is_origin = GNUNET_NO;
grp->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
- grp->is_origin = GNUNET_NO;
- grp->cfg = cfg;
mem->join_dcsn_cb = join_decision_cb;
grp->join_req_cb = join_request_cb;
Modified: gnunet/src/psyc/psyc_api.c
===================================================================
--- gnunet/src/psyc/psyc_api.c 2016-08-16 22:30:52 UTC (rev 37728)
+++ gnunet/src/psyc/psyc_api.c 2016-08-17 21:26:41 UTC (rev 37729)
@@ -55,9 +55,29 @@
/**
* Client connection to the service.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
+ * Message to send on connect.
+ */
+ struct GNUNET_MQ_Envelope *connect_env;
+
+ /**
+ * Time to wait until we try to reconnect on failure.
+ */
+ struct GNUNET_TIME_Relative reconnect_delay;
+
+ /**
+ * Task for reconnecting when the listener fails.
+ */
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
+
+ /**
+ * Async operations.
+ */
+ struct GNUNET_OP_Handle *op;
+
+ /**
* Transmission handle;
*/
struct GNUNET_PSYC_TransmitHandle *tmit;
@@ -68,11 +88,6 @@
struct GNUNET_PSYC_ReceiveHandle *recv;
/**
- * Message to send on reconnect.
- */
- struct GNUNET_MessageHeader *connect_msg;
-
- /**
* Function called after disconnected from the service.
*/
GNUNET_ContinuationCallback disconnect_cb;
@@ -219,41 +234,21 @@
};
-static void
-channel_send_connect_msg (struct GNUNET_PSYC_Channel *chn)
+static int
+check_channel_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- uint16_t cmsg_size = ntohs (chn->connect_msg->size);
- struct GNUNET_MessageHeader *cmsg = GNUNET_malloc (cmsg_size);
- GNUNET_memcpy (cmsg, chn->connect_msg, cmsg_size);
- GNUNET_CLIENT_MANAGER_transmit_now (chn->client, cmsg);
- GNUNET_free (cmsg);
+ return GNUNET_OK;
}
static void
-channel_recv_disconnect (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
- GNUNET_CLIENT_MANAGER_reconnect (client);
- channel_send_connect_msg (chn);
-}
+ struct GNUNET_PSYC_Channel *chn = cls;
-
-static void
-channel_recv_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
-
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
-
- uint16_t size = ntohs (msg->size);
+ uint16_t size = ntohs (res->header.size);
if (size < sizeof (*res))
{ /* Error, message too small. */
GNUNET_break (0);
@@ -262,9 +257,9 @@
uint16_t data_size = size - sizeof (*res);
const char *data = (0 < data_size) ? (void *) &res[1] : NULL;
- GNUNET_CLIENT_MANAGER_op_result (chn->client, GNUNET_ntohll (res->op_id),
- GNUNET_ntohll (res->result_code),
- data, data_size);
+ GNUNET_OP_result (chn->op, GNUNET_ntohll (res->op_id),
+ GNUNET_ntohll (res->result_code),
+ data, data_size, NULL);
}
@@ -301,18 +296,30 @@
}
+static int
+check_channel_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh
(res);
+ uint16_t size = ntohs (res->header.size);
+
+ if (NULL == pmsg || size < sizeof (*res) + sizeof (*pmsg))
+ { /* Error, message too small. */
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-channel_recv_history_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
-
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
+ struct GNUNET_PSYC_Channel *chn = cls;
struct GNUNET_PSYC_MessageHeader *
- pmsg = (struct GNUNET_PSYC_MessageHeader *) &res[1];
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh
(res);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"%p Received historic fragment for message #%" PRIu64 ".\n",
@@ -321,9 +328,9 @@
GNUNET_ResultCallback result_cb = NULL;
struct GNUNET_PSYC_HistoryRequest *hist = NULL;
- if (GNUNET_YES != GNUNET_CLIENT_MANAGER_op_find (chn->client,
- GNUNET_ntohll (res->op_id),
- &result_cb, (void *) &hist))
+ if (GNUNET_YES != GNUNET_OP_get (chn->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &hist, NULL))
{ /* Operation not found. */
LOG (GNUNET_ERROR_TYPE_WARNING,
"%p Replay operation not found for historic fragment of message #%"
@@ -332,47 +339,47 @@
return;
}
- uint16_t size = ntohs (msg->size);
- if (size < sizeof (*res) + sizeof (*pmsg))
- { /* Error, message too small. */
- GNUNET_break (0);
- return;
- }
-
GNUNET_PSYC_receive_message (hist->recv,
(const struct GNUNET_PSYC_MessageHeader *)
pmsg);
}
+static int
+check_channel_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
+ uint16_t mod_size = ntohs (mod->size);
+ uint16_t size = ntohs (res->header.size);
+
+ if (NULL == mod || size - sizeof (*res) != mod_size)
+ {
+ GNUNET_break_op (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-channel_recv_state_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
+ struct GNUNET_PSYC_Channel *chn = cls;
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
-
GNUNET_ResultCallback result_cb = NULL;
struct GNUNET_PSYC_StateRequest *sr = NULL;
- if (GNUNET_YES != GNUNET_CLIENT_MANAGER_op_find (chn->client,
- GNUNET_ntohll (res->op_id),
- &result_cb, (void *) &sr))
+ if (GNUNET_YES != GNUNET_OP_get (chn->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &sr, NULL))
{ /* Operation not found. */
return;
}
- const struct GNUNET_MessageHeader *
- mod = (struct GNUNET_MessageHeader *) &res[1];
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
uint16_t mod_size = ntohs (mod->size);
- if (ntohs (msg->size) - sizeof (*res) != mod_size)
- {
- GNUNET_break (0);
- return;
- }
+
switch (ntohs (mod->type))
{
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER:
@@ -401,40 +408,40 @@
}
+static int
+check_channel_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-channel_recv_message (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
- GNUNET_PSYC_receive_message (chn->recv,
- (const struct GNUNET_PSYC_MessageHeader *) msg);
+ struct GNUNET_PSYC_Channel *chn = cls;
+
+ GNUNET_PSYC_receive_message (chn->recv, pmsg);
}
static void
-channel_recv_message_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_channel_message_ack (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_PSYC_Channel *
- chn = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*chn));
+ struct GNUNET_PSYC_Channel *chn = cls;
+
GNUNET_PSYC_transmit_got_ack (chn->tmit);
}
static void
-master_recv_start_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_master_start_ack (void *cls,
+ const struct GNUNET_PSYC_CountersResultMessage *cres)
{
- struct GNUNET_PSYC_Master *
- mst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_PSYC_Channel));
+ struct GNUNET_PSYC_Master *mst = cls;
- struct GNUNET_PSYC_CountersResultMessage *
- cres = (struct GNUNET_PSYC_CountersResultMessage *) msg;
int32_t result = ntohl (cres->result_code);
if (GNUNET_OK != result && GNUNET_NO != result)
{
@@ -447,23 +454,27 @@
}
+static int
+check_master_join_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
+{
+ return GNUNET_OK;
+}
+
+
static void
-master_recv_join_request (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_master_join_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
{
- struct GNUNET_PSYC_Master *
- mst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_PSYC_Channel));
+ struct GNUNET_PSYC_Master *mst = cls;
+
if (NULL == mst->join_req_cb)
return;
- const struct GNUNET_PSYC_JoinRequestMessage *
- req = (const struct GNUNET_PSYC_JoinRequestMessage *) msg;
const struct GNUNET_PSYC_Message *join_msg = NULL;
if (sizeof (*req) + sizeof (*join_msg) <= ntohs (req->header.size))
{
- join_msg = (struct GNUNET_PSYC_Message *) &req[1];
+ join_msg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh
(req);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received join_msg of type %u and size %u.\n",
ntohs (join_msg->header.type), ntohs (join_msg->header.size));
@@ -479,15 +490,11 @@
static void
-slave_recv_join_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_slave_join_ack (void *cls,
+ const struct GNUNET_PSYC_CountersResultMessage *cres)
{
- struct GNUNET_PSYC_Slave *
- slv = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_PSYC_Channel));
- struct GNUNET_PSYC_CountersResultMessage *
- cres = (struct GNUNET_PSYC_CountersResultMessage *) msg;
+ struct GNUNET_PSYC_Slave *slv = cls;
+
int32_t result = ntohl (cres->result_code);
if (GNUNET_YES != result && GNUNET_NO != result)
{
@@ -500,16 +507,19 @@
}
+static int
+check_slave_join_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage *dcsn)
+{
+ return GNUNET_OK;
+}
+
+
static void
-slave_recv_join_decision (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_slave_join_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage *dcsn)
{
- struct GNUNET_PSYC_Slave *
- slv = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_PSYC_Channel));
- const struct GNUNET_PSYC_JoinDecisionMessage *
- dcsn = (const struct GNUNET_PSYC_JoinDecisionMessage *) msg;
+ struct GNUNET_PSYC_Slave *slv = cls;
struct GNUNET_PSYC_Message *pmsg = NULL;
if (ntohs (dcsn->header.size) <= sizeof (*dcsn) + sizeof (*pmsg))
@@ -520,104 +530,164 @@
}
-static struct GNUNET_CLIENT_MANAGER_MessageHandler master_handlers[] =
+static void
+channel_cleanup (struct GNUNET_PSYC_Channel *chn)
{
- { &channel_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+ if (NULL != chn->recv)
+ {
+ GNUNET_PSYC_receive_destroy (chn->recv);
+ chn->recv = NULL;
+ }
+ if (NULL != chn->connect_env)
+ {
+ GNUNET_MQ_discard (chn->connect_env);
+ chn->connect_env = NULL;
+ }
+ if (NULL != chn->disconnect_cb)
+ {
+ chn->disconnect_cb (chn->disconnect_cls);
+ chn->disconnect_cb = NULL;
+ }
+}
- { &channel_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
- { &master_recv_start_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK,
- sizeof (struct GNUNET_PSYC_CountersResultMessage), GNUNET_NO },
+static void
+master_cleanup (void *cls)
+{
+ struct GNUNET_PSYC_Master *mst = cls;
+ channel_cleanup (&mst->chn);
+ GNUNET_free (mst);
+}
- { &master_recv_join_request, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
- sizeof (struct GNUNET_PSYC_JoinRequestMessage), GNUNET_YES },
- { &channel_recv_history_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
+static void
+slave_cleanup (void *cls)
+{
+ struct GNUNET_PSYC_Slave *slv = cls;
+ channel_cleanup (&slv->chn);
+ GNUNET_free (slv);
+}
- { &channel_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
- { &channel_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { &channel_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
-
-
-static struct GNUNET_CLIENT_MANAGER_MessageHandler slave_handlers[] =
+static void
+channel_disconnect (struct GNUNET_PSYC_Channel *chn,
+ GNUNET_ContinuationCallback cb,
+ void *cls)
{
- { &channel_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
+ chn->is_disconnecting = GNUNET_YES;
+ chn->disconnect_cb = cb;
+ chn->disconnect_cls = cls;
- { &channel_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
+ // FIXME: wait till queued messages are sent
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+}
- { &slave_recv_join_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN_ACK,
- sizeof (struct GNUNET_PSYC_CountersResultMessage), GNUNET_NO },
- { &slave_recv_join_decision, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
- sizeof (struct GNUNET_PSYC_JoinDecisionMessage), GNUNET_YES },
+/*** MASTER ***/
- { &channel_recv_history_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
- { &channel_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
+static void
+master_connect (struct GNUNET_PSYC_Master *mst);
- { &channel_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
- { &channel_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
-
-
static void
-channel_cleanup (struct GNUNET_PSYC_Channel *chn)
+master_reconnect (void *cls)
{
- GNUNET_PSYC_transmit_destroy (chn->tmit);
- GNUNET_PSYC_receive_destroy (chn->recv);
- GNUNET_free (chn->connect_msg);
- if (NULL != chn->disconnect_cb)
- chn->disconnect_cb (chn->disconnect_cls);
+ master_connect (cls);
}
+/**
+ * Master client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
static void
-master_cleanup (void *cls)
+master_disconnected (void *cls, enum GNUNET_MQ_Error error)
{
struct GNUNET_PSYC_Master *mst = cls;
- channel_cleanup (&mst->chn);
- GNUNET_free (mst);
+ struct GNUNET_PSYC_Channel *chn = &mst->chn;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Master client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+
+ chn->reconnect_task = GNUNET_SCHEDULER_add_delayed (chn->reconnect_delay,
+ master_reconnect,
+ mst);
+ chn->reconnect_delay = GNUNET_TIME_STD_BACKOFF (chn->reconnect_delay);
}
static void
-slave_cleanup (void *cls)
+master_connect (struct GNUNET_PSYC_Master *mst)
{
- struct GNUNET_PSYC_Slave *slv = cls;
- channel_cleanup (&slv->chn);
- GNUNET_free (slv);
+ struct GNUNET_PSYC_Channel *chn = &mst->chn;
+
+ GNUNET_MQ_hd_fixed_size (master_start_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MASTER_START_ACK,
+ struct GNUNET_PSYC_CountersResultMessage);
+
+ GNUNET_MQ_hd_var_size (master_join_request,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
+ struct GNUNET_PSYC_JoinRequestMessage);
+
+ GNUNET_MQ_hd_var_size (channel_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader);
+
+ GNUNET_MQ_hd_fixed_size (channel_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (channel_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (channel_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (channel_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage);
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_master_start_ack_handler (mst),
+ make_master_join_request_handler (mst),
+ make_channel_message_handler (chn),
+ make_channel_message_ack_handler (chn),
+ make_channel_history_result_handler (chn),
+ make_channel_state_result_handler (chn),
+ make_channel_result_handler (chn),
+ GNUNET_MQ_handler_end ()
+ };
+
+ chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc",
+ handlers, master_disconnected, mst);
+ GNUNET_assert (NULL != chn->mq);
+ chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
+
+ GNUNET_MQ_send_copy (chn->mq, chn->connect_env);
}
@@ -664,26 +734,23 @@
struct GNUNET_PSYC_Channel *chn = &mst->chn;
struct MasterStartRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.size = htons (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MASTER_START);
+ chn->connect_env = GNUNET_MQ_msg (req,
+ GNUNET_MESSAGE_TYPE_PSYC_MASTER_START);
req->channel_key = *channel_key;
req->policy = policy;
- chn->connect_msg = &req->header;
chn->cfg = cfg;
chn->is_master = GNUNET_YES;
+ chn->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
+ chn->op = GNUNET_OP_create ();
+ chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
+
mst->start_cb = start_cb;
mst->join_req_cb = join_request_cb;
mst->cb_cls = cls;
- chn->client = GNUNET_CLIENT_MANAGER_connect (cfg, "psyc", master_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (chn->client, mst, sizeof (*chn));
-
- chn->tmit = GNUNET_PSYC_transmit_create (chn->client);
- chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
-
- channel_send_connect_msg (chn);
+ master_connect (mst);
return mst;
}
@@ -704,12 +771,8 @@
/* FIXME: send msg to service */
- chn->is_disconnecting = GNUNET_YES;
- chn->disconnect_cb = stop_cb;
- chn->disconnect_cls = stop_cls;
-
- GNUNET_CLIENT_MANAGER_disconnect (mst->chn.client, GNUNET_YES,
- &master_cleanup, mst);
+ channel_disconnect (chn, stop_cb, stop_cls);
+ master_cleanup (mst);
}
@@ -753,9 +816,9 @@
< sizeof (*dcsn) + relay_size + join_resp_size)
return GNUNET_SYSERR;
- dcsn = GNUNET_malloc (sizeof (*dcsn) + relay_size + join_resp_size);
- dcsn->header.size = htons (sizeof (*dcsn) + relay_size + join_resp_size);
- dcsn->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (dcsn, relay_size + join_resp_size,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
dcsn->is_admitted = htonl (is_admitted);
dcsn->slave_pub_key = jh->slave_pub_key;
@@ -762,8 +825,7 @@
if (0 < join_resp_size)
GNUNET_memcpy (&dcsn[1], join_resp, join_resp_size);
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &dcsn->header);
- GNUNET_free (dcsn);
+ GNUNET_MQ_send (chn->mq, env);
GNUNET_free (jh);
return GNUNET_OK;
}
@@ -838,7 +900,105 @@
}
+/*** SLAVE ***/
+
+
+static void
+slave_connect (struct GNUNET_PSYC_Slave *slv);
+
+
+static void
+slave_reconnect (void *cls)
+{
+ slave_connect (cls);
+}
+
+
/**
+ * Slave client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
+static void
+slave_disconnected (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_PSYC_Slave *slv = cls;
+ struct GNUNET_PSYC_Channel *chn = &slv->chn;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Slave client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != chn->mq)
+ {
+ GNUNET_MQ_destroy (chn->mq);
+ chn->mq = NULL;
+ }
+ if (NULL != chn->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (chn->tmit);
+ chn->tmit = NULL;
+ }
+ chn->reconnect_task = GNUNET_SCHEDULER_add_delayed (chn->reconnect_delay,
+ slave_reconnect,
+ slv);
+ chn->reconnect_delay = GNUNET_TIME_STD_BACKOFF (chn->reconnect_delay);
+}
+
+
+static void
+slave_connect (struct GNUNET_PSYC_Slave *slv)
+{
+ struct GNUNET_PSYC_Channel *chn = &slv->chn;
+
+ GNUNET_MQ_hd_fixed_size (slave_join_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN_ACK,
+ struct GNUNET_PSYC_CountersResultMessage);
+
+ GNUNET_MQ_hd_var_size (slave_join_decision,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
+ struct GNUNET_PSYC_JoinDecisionMessage);
+
+ GNUNET_MQ_hd_var_size (channel_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader);
+
+ GNUNET_MQ_hd_fixed_size (channel_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (channel_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (channel_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (channel_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage);
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_slave_join_ack_handler (slv),
+ make_slave_join_decision_handler (slv),
+ make_channel_message_handler (chn),
+ make_channel_message_ack_handler (chn),
+ make_channel_history_result_handler (chn),
+ make_channel_state_result_handler (chn),
+ make_channel_result_handler (chn),
+ GNUNET_MQ_handler_end ()
+ };
+
+ chn->mq = GNUNET_CLIENT_connecT (chn->cfg, "psyc",
+ handlers, slave_disconnected, slv);
+ GNUNET_assert (NULL != chn->mq);
+ chn->tmit = GNUNET_PSYC_transmit_create (chn->mq);
+
+ GNUNET_MQ_send_copy (chn->mq, chn->connect_env);
+}
+
+
+/**
* Join a PSYC channel.
*
* The entity joining is always the local peer. The user must immediately use
@@ -892,15 +1052,14 @@
struct GNUNET_PSYC_Channel *chn = &slv->chn;
uint16_t relay_size = relay_count * sizeof (*relays);
uint16_t join_msg_size;
- struct SlaveJoinRequest *req;
-
if (NULL == join_msg)
join_msg_size = 0;
else
join_msg_size = ntohs (join_msg->header.size);
- req = GNUNET_malloc (sizeof (*req) + relay_size + join_msg_size);
- req->header.size = htons (sizeof (*req) + relay_size + join_msg_size);
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
+
+ struct SlaveJoinRequest *req;
+ chn->connect_env = GNUNET_MQ_msg_extra (req, relay_size + join_msg_size,
+ GNUNET_MESSAGE_TYPE_PSYC_SLAVE_JOIN);
req->channel_pub_key = *channel_pub_key;
req->slave_key = *slave_key;
req->origin = *origin;
@@ -913,21 +1072,18 @@
if (NULL != join_msg)
GNUNET_memcpy ((char *) &req[1] + relay_size, join_msg, join_msg_size);
- chn->connect_msg = &req->header;
chn->cfg = cfg;
chn->is_master = GNUNET_NO;
+ chn->reconnect_delay = GNUNET_TIME_UNIT_MILLISECONDS;
+ chn->op = GNUNET_OP_create ();
+ chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
+
slv->connect_cb = connect_cb;
slv->join_dcsn_cb = join_decision_cb;
slv->cb_cls = cls;
- chn->client = GNUNET_CLIENT_MANAGER_connect (cfg, "psyc", slave_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (chn->client, slv, sizeof (*chn));
-
- chn->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
- chn->tmit = GNUNET_PSYC_transmit_create (chn->client);
-
- channel_send_connect_msg (chn);
+ slave_connect (slv);
return slv;
}
@@ -950,12 +1106,8 @@
/* FIXME: send msg to service */
- chn->is_disconnecting = GNUNET_YES;
- chn->disconnect_cb = part_cb;
- chn->disconnect_cls = part_cls;
-
- GNUNET_CLIENT_MANAGER_disconnect (slv->chn.client, GNUNET_YES,
- &slave_cleanup, slv);
+ channel_disconnect (chn, part_cb, part_cls);
+ slave_cleanup (slv);
}
@@ -1069,18 +1221,16 @@
GNUNET_ResultCallback result_cb,
void *cls)
{
- struct ChannelMembershipStoreRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
- req->header.size = htons (sizeof (*req));
+ struct ChannelMembershipStoreRequest *req;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (req,
GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
req->slave_pub_key = *slave_pub_key;
req->announced_at = GNUNET_htonll (announced_at);
req->effective_since = GNUNET_htonll (effective_since);
req->did_join = GNUNET_YES;
- req->op_id = GNUNET_htonll (GNUNET_CLIENT_MANAGER_op_add (chn->client,
- result_cb, cls));
+ req->op_id = GNUNET_htonll (GNUNET_OP_add (chn->op, result_cb, cls, NULL));
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (chn->mq, env);
}
@@ -1122,17 +1272,15 @@
GNUNET_ResultCallback result_cb,
void *cls)
{
- struct ChannelMembershipStoreRequest *req = GNUNET_malloc (sizeof (*req));
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
- req->header.size = htons (sizeof (*req));
+ struct ChannelMembershipStoreRequest *req;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (req,
GNUNET_MESSAGE_TYPE_PSYC_CHANNEL_MEMBERSHIP_STORE);
req->slave_pub_key = *slave_pub_key;
req->announced_at = GNUNET_htonll (announced_at);
req->did_join = GNUNET_NO;
- req->op_id = GNUNET_htonll (GNUNET_CLIENT_MANAGER_op_add (chn->client,
- result_cb, cls));
+ req->op_id = GNUNET_htonll (GNUNET_OP_add (chn->op, result_cb, cls, NULL));
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (chn->mq, env);
}
@@ -1154,8 +1302,7 @@
hist->recv = GNUNET_PSYC_receive_create (message_cb, message_part_cb, cls);
hist->result_cb = result_cb;
hist->cls = cls;
- hist->op_id = GNUNET_CLIENT_MANAGER_op_add (chn->client,
- &op_recv_history_result, hist);
+ hist->op_id = GNUNET_OP_add (chn->op, op_recv_history_result, hist, NULL);
GNUNET_assert (NULL != method_prefix);
uint16_t method_size = strnlen (method_prefix,
@@ -1162,9 +1309,10 @@
GNUNET_SERVER_MAX_MESSAGE_SIZE
- sizeof (*req)) + 1;
GNUNET_assert ('\0' == method_prefix[method_size - 1]);
- req = GNUNET_malloc (sizeof (*req) + method_size);
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
- req->header.size = htons (sizeof (*req) + method_size);
+
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, method_size,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
req->start_message_id = GNUNET_htonll (start_message_id);
req->end_message_id = GNUNET_htonll (end_message_id);
req->message_limit = GNUNET_htonll (message_limit);
@@ -1172,8 +1320,7 @@
req->op_id = GNUNET_htonll (hist->op_id);
GNUNET_memcpy (&req[1], method_prefix, method_size);
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (chn->mq, env);
return hist;
}
@@ -1263,7 +1410,7 @@
struct GNUNET_PSYC_HistoryRequest
*hist)
{
GNUNET_PSYC_receive_destroy (hist->recv);
- GNUNET_CLIENT_MANAGER_op_cancel (hist->chn->client, hist->op_id);
+ GNUNET_OP_remove (hist->chn->op, hist->op_id);
GNUNET_free (hist);
}
@@ -1301,20 +1448,17 @@
sr->var_cb = var_cb;
sr->result_cb = result_cb;
sr->cls = cls;
- sr->op_id = GNUNET_CLIENT_MANAGER_op_add (chn->client,
- &op_recv_state_result, sr);
+ sr->op_id = GNUNET_OP_add (chn->op, op_recv_state_result, sr, NULL);
GNUNET_assert (NULL != name);
size_t name_size = strnlen (name, GNUNET_SERVER_MAX_MESSAGE_SIZE
- sizeof (*req)) + 1;
- req = GNUNET_malloc (sizeof (*req) + name_size);
- req->header.type = htons (type);
- req->header.size = htons (sizeof (*req) + name_size);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, name_size, type);
req->op_id = GNUNET_htonll (sr->op_id);
GNUNET_memcpy (&req[1], name, name_size);
- GNUNET_CLIENT_MANAGER_transmit (chn->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (chn->mq, env);
return sr;
}
@@ -1397,7 +1541,7 @@
void
GNUNET_PSYC_channel_state_get_cancel (struct GNUNET_PSYC_StateRequest *sr)
{
- GNUNET_CLIENT_MANAGER_op_cancel (sr->chn->client, sr->op_id);
+ GNUNET_OP_remove (sr->chn->op, sr->op_id);
GNUNET_free (sr);
}
Modified: gnunet/src/psycstore/psycstore_api.c
===================================================================
--- gnunet/src/psycstore/psycstore_api.c 2016-08-16 22:30:52 UTC (rev
37728)
+++ gnunet/src/psycstore/psycstore_api.c 2016-08-17 21:26:41 UTC (rev
37729)
@@ -89,7 +89,6 @@
*/
struct GNUNET_MQ_Handle *mq;
-
/**
* Async operations.
*/
Modified: gnunet/src/psycutil/psyc_message.c
===================================================================
--- gnunet/src/psycutil/psyc_message.c 2016-08-16 22:30:52 UTC (rev 37728)
+++ gnunet/src/psycutil/psyc_message.c 2016-08-17 21:26:41 UTC (rev 37729)
@@ -39,7 +39,7 @@
/**
* Client connection to service.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
* Message currently being received from the client.
@@ -47,6 +47,11 @@
struct GNUNET_MessageHeader *msg;
/**
+ * Envelope for @a msg
+ */
+ struct GNUNET_MQ_Envelope *env;
+
+ /**
* Callback to request next modifier from client.
*/
GNUNET_PSYC_TransmitNotifyModifier notify_mod;
@@ -327,11 +332,11 @@
* Create a transmission handle.
*/
struct GNUNET_PSYC_TransmitHandle *
-GNUNET_PSYC_transmit_create (struct GNUNET_CLIENT_MANAGER_Connection *client)
+GNUNET_PSYC_transmit_create (struct GNUNET_MQ_Handle *mq)
{
struct GNUNET_PSYC_TransmitHandle *tmit = GNUNET_new (struct
GNUNET_PSYC_TransmitHandle);
- tmit->client = client;
+ tmit->mq = mq;
return tmit;
}
@@ -378,9 +383,9 @@
{
/* End of message or buffer is full, add it to transmission queue
* and start with empty buffer */
- tmit->msg->type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
tmit->msg->size = htons (tmit->msg->size);
- GNUNET_CLIENT_MANAGER_transmit (tmit->client, tmit->msg);
+ GNUNET_MQ_send (tmit->mq, tmit->env);
+ tmit->env = NULL;
tmit->msg = NULL;
tmit->acks_pending++;
}
@@ -387,7 +392,6 @@
else
{
/* Message fits in current buffer, append */
- tmit->msg = GNUNET_realloc (tmit->msg, tmit->msg->size + size);
GNUNET_memcpy ((char *) tmit->msg + tmit->msg->size, msg, size);
tmit->msg->size += size;
}
@@ -396,8 +400,13 @@
if (NULL == tmit->msg && NULL != msg)
{
/* Empty buffer, copy over message. */
- tmit->msg = GNUNET_malloc (sizeof (*tmit->msg) + size);
+ tmit->env = GNUNET_MQ_msg_extra (tmit->msg,
+ GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
+ /* store current message size in host byte order
+ * then later switch it to network byte order before sending */
tmit->msg->size = sizeof (*tmit->msg) + size;
+
GNUNET_memcpy (&tmit->msg[1], msg, size);
}
@@ -407,9 +416,9 @@
< tmit->msg->size + sizeof (struct GNUNET_MessageHeader))))
{
/* End of message or buffer is full, add it to transmission queue. */
- tmit->msg->type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
tmit->msg->size = htons (tmit->msg->size);
- GNUNET_CLIENT_MANAGER_transmit (tmit->client, tmit->msg);
+ GNUNET_MQ_send (tmit->mq, tmit->env);
+ tmit->env = NULL;
tmit->msg = NULL;
tmit->acks_pending++;
}
@@ -722,7 +731,12 @@
size_t size = strlen (method_name) + 1;
struct GNUNET_PSYC_MessageMethod *pmeth;
- tmit->msg = GNUNET_malloc (sizeof (*tmit->msg) + sizeof (*pmeth) + size);
+
+ tmit->env = GNUNET_MQ_msg_extra (tmit->msg,
+ GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE);
+ /* store current message size in host byte order
+ * then later switch it to network byte order before sending */
tmit->msg->size = sizeof (*tmit->msg) + sizeof (*pmeth) + size;
if (NULL != notify_mod)
Modified: gnunet/src/social/social_api.c
===================================================================
--- gnunet/src/social/social_api.c 2016-08-16 22:30:52 UTC (rev 37728)
+++ gnunet/src/social/social_api.c 2016-08-17 21:26:41 UTC (rev 37729)
@@ -71,14 +71,29 @@
/**
* Client connection to the service.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
- * Message to send on reconnect.
+ * Message to send on connect.
*/
- struct GNUNET_MessageHeader *connect_msg;
+ struct GNUNET_MQ_Envelope *connect_env;
/**
+ * Time to wait until we try to reconnect on failure.
+ */
+ struct GNUNET_TIME_Relative reconnect_delay;
+
+ /**
+ * Task for reconnecting when the listener fails.
+ */
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
+
+ /**
+ * Async operations.
+ */
+ struct GNUNET_OP_Handle *op;
+
+ /**
* Function called after disconnected from the service.
*/
GNUNET_ContinuationCallback disconnect_cb;
@@ -136,9 +151,29 @@
/**
* Client connection to the service.
*/
- struct GNUNET_CLIENT_MANAGER_Connection *client;
+ struct GNUNET_MQ_Handle *mq;
/**
+ * Message to send on connect.
+ */
+ struct GNUNET_MQ_Envelope *connect_env;
+
+ /**
+ * Time to wait until we try to reconnect on failure.
+ */
+ struct GNUNET_TIME_Relative reconnect_delay;
+
+ /**
+ * Task for reconnecting when the listener fails.
+ */
+ struct GNUNET_SCHEDULER_Task *reconnect_task;
+
+ /**
+ * Async operations.
+ */
+ struct GNUNET_OP_Handle *op;
+
+ /**
* Transmission handle.
*/
struct GNUNET_PSYC_TransmitHandle *tmit;
@@ -149,11 +184,6 @@
struct GNUNET_PSYC_Slicer *slicer;
/**
- * Message to send on reconnect.
- */
- struct GNUNET_MessageHeader *connect_msg;
-
- /**
* Function called after disconnected from the service.
*/
GNUNET_ContinuationCallback disconnect_cb;
@@ -337,7 +367,6 @@
struct ZoneAddNymHandle
{
- struct ZoneAddNymRequest *req;
GNUNET_ResultCallback result_cb;
void *result_cls;
};
@@ -481,109 +510,66 @@
}
-/*** CLIENT ***/
+/*** PLACE ***/
-static void
-app_send_connect_msg (struct GNUNET_SOCIAL_App *app)
+static int
+check_place_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- uint16_t cmsg_size = ntohs (app->connect_msg->size);
- struct GNUNET_MessageHeader * cmsg = GNUNET_malloc (cmsg_size);
- GNUNET_memcpy (cmsg, app->connect_msg, cmsg_size);
- GNUNET_CLIENT_MANAGER_transmit_now (app->client, cmsg);
- GNUNET_free (cmsg);
+ uint16_t size = ntohs (res->header.size);
+ if (size < sizeof (*res))
+ { /* Error, message too small. */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
static void
-app_recv_disconnect (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_place_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ struct GNUNET_SOCIAL_Place *plc = cls;
- GNUNET_CLIENT_MANAGER_reconnect (client);
- app_send_connect_msg (app);
-}
+ uint16_t size = ntohs (res->header.size);
+ uint16_t data_size = size - sizeof (*res);
+ const char *data = (0 < data_size) ? (const char *) &res[1] : NULL;
-
-/*** PLACE ***/
-
-
-static void
-place_send_connect_msg (struct GNUNET_SOCIAL_Place *plc)
-{
- uint16_t cmsg_size = ntohs (plc->connect_msg->size);
- struct GNUNET_MessageHeader * cmsg = GNUNET_malloc (cmsg_size);
- GNUNET_memcpy (cmsg, plc->connect_msg, cmsg_size);
- GNUNET_CLIENT_MANAGER_transmit_now (plc->client, cmsg);
- GNUNET_free (cmsg);
+ GNUNET_OP_result (plc->op, GNUNET_ntohll (res->op_id),
+ GNUNET_ntohll (res->result_code),
+ data, data_size, NULL);
}
-static void
-place_recv_disconnect (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+static int
+check_app_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
-
- GNUNET_CLIENT_MANAGER_reconnect (client);
- place_send_connect_msg (plc);
-}
-
-
-static void
-place_recv_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
-
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
-
- uint16_t size = ntohs (msg->size);
+ uint16_t size = ntohs (res->header.size);
if (size < sizeof (*res))
{ /* Error, message too small. */
GNUNET_break (0);
- return;
+ return GNUNET_SYSERR;
}
-
- uint16_t data_size = size - sizeof (*res);
- const char *data = (0 < data_size) ? (const char *) &res[1] : NULL;
- GNUNET_CLIENT_MANAGER_op_result (plc->client, GNUNET_ntohll (res->op_id),
- GNUNET_ntohll (res->result_code),
- data, data_size);
+ return GNUNET_OK;
}
static void
-app_recv_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_app_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ struct GNUNET_SOCIAL_App *app = cls;
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
-
- uint16_t size = ntohs (msg->size);
- if (size < sizeof (*res))
- { /* Error, message too small. */
- GNUNET_break (0);
- return;
- }
-
+ uint16_t size = ntohs (res->header.size);
uint16_t data_size = size - sizeof (*res);
const char *data = (0 < data_size) ? (const char *) &res[1] : NULL;
- GNUNET_CLIENT_MANAGER_op_result (app->client, GNUNET_ntohll (res->op_id),
- GNUNET_ntohll (res->result_code),
- data, data_size);
+
+ GNUNET_OP_result (app->op, GNUNET_ntohll (res->op_id),
+ GNUNET_ntohll (res->result_code),
+ data, data_size, NULL);
}
@@ -619,18 +605,30 @@
}
+static int
+check_place_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ struct GNUNET_PSYC_MessageHeader *
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh
(res);
+ uint16_t size = ntohs (res->header.size);
+
+ if (NULL == pmsg || size < sizeof (*res) + sizeof (*pmsg))
+ { /* Error, message too small. */
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-place_recv_history_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_place_history_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
-
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
+ struct GNUNET_SOCIAL_Place *plc = cls;
struct GNUNET_PSYC_MessageHeader *
- pmsg = (struct GNUNET_PSYC_MessageHeader *) &res[1];
+ pmsg = (struct GNUNET_PSYC_MessageHeader *) GNUNET_MQ_extract_nested_mh
(res);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"%p Received historic fragment for message #%" PRIu64 ".\n",
@@ -639,9 +637,9 @@
GNUNET_ResultCallback result_cb = NULL;
struct GNUNET_SOCIAL_HistoryRequest *hist = NULL;
- if (GNUNET_YES != GNUNET_CLIENT_MANAGER_op_find (plc->client,
- GNUNET_ntohll (res->op_id),
- &result_cb, (void *) &hist))
+ if (GNUNET_YES != GNUNET_OP_get (plc->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &hist, NULL))
{ /* Operation not found. */
LOG (GNUNET_ERROR_TYPE_WARNING,
"%p Replay operation not found for historic fragment of message #%"
@@ -650,50 +648,50 @@
return;
}
- uint16_t size = ntohs (msg->size);
- if (size < sizeof (*res) + sizeof (*pmsg))
- { /* Error, message too small. */
- GNUNET_break (0);
- return;
- }
-
GNUNET_PSYC_slicer_message (hist->slicer,
(const struct GNUNET_PSYC_MessageHeader *) pmsg);
}
+static int
+check_place_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
+{
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
+ uint16_t mod_size = ntohs (mod->size);
+ uint16_t size = ntohs (res->header.size);
+
+ if (NULL == mod || size - sizeof (*res) != mod_size)
+ {
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid modifier size in state result: %u - %u != %u\n",
+ ntohs (res->header.size), sizeof (*res), mod_size);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+
static void
-place_recv_state_result (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_place_state_result (void *cls,
+ const struct GNUNET_OperationResultMessage *res)
{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
+ struct GNUNET_SOCIAL_Place *plc = cls;
- const struct GNUNET_OperationResultMessage *
- res = (const struct GNUNET_OperationResultMessage *) msg;
-
GNUNET_ResultCallback result_cb = NULL;
struct GNUNET_SOCIAL_LookHandle *look = NULL;
- if (GNUNET_YES != GNUNET_CLIENT_MANAGER_op_find (plc->client,
- GNUNET_ntohll (res->op_id),
- &result_cb, (void *) &look))
+ if (GNUNET_YES != GNUNET_OP_get (plc->op,
+ GNUNET_ntohll (res->op_id),
+ &result_cb, (void *) &look, NULL))
{ /* Operation not found. */
return;
}
- const struct GNUNET_MessageHeader *
- mod = (struct GNUNET_MessageHeader *) &res[1];
+ const struct GNUNET_MessageHeader *mod = GNUNET_MQ_extract_nested_mh (res);
uint16_t mod_size = ntohs (mod->size);
- if (ntohs (msg->size) - sizeof (*res) != mod_size)
- {
- GNUNET_break_op (0);
- LOG (GNUNET_ERROR_TYPE_WARNING,
- "Invalid modifier size in state result: %u - %u != %u\n",
- ntohs (msg->size), sizeof (*res), mod_size);
- return;
- }
+
switch (ntohs (mod->type))
{
case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_MODIFIER:
@@ -737,52 +735,58 @@
static void
-place_recv_message_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_place_message_ack (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
+ struct GNUNET_SOCIAL_Place *plc = cls;
+
GNUNET_PSYC_transmit_got_ack (plc->tmit);
}
+static int
+check_place_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-place_recv_message (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_place_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
{
- struct GNUNET_SOCIAL_Place *
- plc = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*plc));
- GNUNET_PSYC_slicer_message (plc->slicer,
- (const struct GNUNET_PSYC_MessageHeader *) msg);
+ struct GNUNET_SOCIAL_Place *plc = cls;
+
+ GNUNET_PSYC_slicer_message (plc->slicer, pmsg);
}
+static int
+check_host_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-host_recv_message (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_host_message (void *cls,
+ const struct GNUNET_PSYC_MessageHeader *pmsg)
{
- struct GNUNET_SOCIAL_Host *
- hst = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (hst->plc));
- GNUNET_PSYC_slicer_message (hst->slicer,
- (const struct GNUNET_PSYC_MessageHeader *) msg);
- GNUNET_PSYC_slicer_message (hst->plc.slicer,
- (const struct GNUNET_PSYC_MessageHeader *) msg);
+ struct GNUNET_SOCIAL_Host *hst = cls;
+
+ GNUNET_PSYC_slicer_message (hst->slicer, pmsg);
+ GNUNET_PSYC_slicer_message (hst->plc.slicer, pmsg);
}
static void
-host_recv_enter_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_host_enter_ack (void *cls,
+ const struct HostEnterAck *hack)
{
- struct GNUNET_SOCIAL_Host *
- hst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_SOCIAL_Place));
+ struct GNUNET_SOCIAL_Host *hst = cls;
- struct HostEnterAck *hack = (struct HostEnterAck *) msg;
hst->plc.pub_key = hack->place_pub_key;
int32_t result = ntohl (hack->result_code);
@@ -792,14 +796,20 @@
}
+static int
+check_host_enter_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
+{
+ return GNUNET_OK;
+}
+
+
static void
-host_recv_enter_request (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_host_enter_request (void *cls,
+ const struct GNUNET_PSYC_JoinRequestMessage *req)
{
- struct GNUNET_SOCIAL_Host *
- hst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_SOCIAL_Place));
+ struct GNUNET_SOCIAL_Host *hst = cls;
+
if (NULL == hst->answer_door_cb)
return;
@@ -809,8 +819,6 @@
const void *data = NULL;
uint16_t data_size = 0;
char *str;
- const struct GNUNET_PSYC_JoinRequestMessage *
- req = (const struct GNUNET_PSYC_JoinRequestMessage *) msg;
const struct GNUNET_PSYC_Message *join_msg = NULL;
do
@@ -817,7 +825,7 @@
{
if (sizeof (*req) + sizeof (*join_msg) <= ntohs (req->header.size))
{
- join_msg = (struct GNUNET_PSYC_Message *) &req[1];
+ join_msg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh
(req);
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Received join_msg of type %u and size %u.\n",
ntohs (join_msg->header.type), ntohs (join_msg->header.size));
@@ -850,16 +858,11 @@
static void
-guest_recv_enter_ack (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_guest_enter_ack (void *cls,
+ const struct GNUNET_PSYC_CountersResultMessage *cres)
{
- struct GNUNET_SOCIAL_Guest *
- gst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_SOCIAL_Place));
+ struct GNUNET_SOCIAL_Guest *gst = cls;
- struct GNUNET_PSYC_CountersResultMessage *
- cres = (struct GNUNET_PSYC_CountersResultMessage *) msg;
int32_t result = ntohl (cres->result_code);
if (NULL != gst->enter_cb)
gst->enter_cb (gst->cb_cls, result, &gst->plc.pub_key,
@@ -867,20 +870,23 @@
}
+static int
+check_guest_enter_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage *dcsn)
+{
+ return GNUNET_OK;
+}
+
+
static void
-guest_recv_join_decision (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_guest_enter_decision (void *cls,
+ const struct GNUNET_PSYC_JoinDecisionMessage
*dcsn)
{
- struct GNUNET_SOCIAL_Guest *
- gst = GNUNET_CLIENT_MANAGER_get_user_context_ (client,
- sizeof (struct
GNUNET_SOCIAL_Place));
- const struct GNUNET_PSYC_JoinDecisionMessage *
- dcsn = (const struct GNUNET_PSYC_JoinDecisionMessage *) msg;
+ struct GNUNET_SOCIAL_Guest *gst = cls;
struct GNUNET_PSYC_Message *pmsg = NULL;
if (ntohs (dcsn->header.size) <= sizeof (*dcsn) + sizeof (*pmsg))
- pmsg = (struct GNUNET_PSYC_Message *) &dcsn[1];
+ pmsg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh (dcsn);
if (NULL != gst->entry_dcsn_cb)
gst->entry_dcsn_cb (gst->cb_cls, ntohl (dcsn->is_admitted), pmsg);
@@ -887,17 +893,20 @@
}
+static int
+check_app_ego (void *cls,
+ const struct AppEgoMessage *emsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-app_recv_ego (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_app_ego (void *cls,
+ const struct AppEgoMessage *emsg)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ struct GNUNET_SOCIAL_App *app = cls;
- struct AppEgoMessage *
- emsg = (struct AppEgoMessage *) msg;
-
uint16_t name_size = ntohs (emsg->header.size) - sizeof (*emsg);
struct GNUNET_HashCode ego_pub_hash;
@@ -928,26 +937,27 @@
static void
-app_recv_ego_end (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_app_ego_end (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ //struct GNUNET_SOCIAL_App *app = cls;
}
+static int
+check_app_place (void *cls,
+ const struct AppPlaceMessage *pmsg)
+{
+ return GNUNET_OK;
+}
+
+
static void
-app_recv_place (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_app_place (void *cls,
+ const struct AppPlaceMessage *pmsg)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ struct GNUNET_SOCIAL_App *app = cls;
- struct AppPlaceMessage *
- pmsg = (struct AppPlaceMessage *) msg;
-
if ((GNUNET_YES == pmsg->is_host && NULL == app->host_cb)
|| (GNUNET_NO == pmsg->is_host && NULL == app->guest_cb))
return;
@@ -987,12 +997,10 @@
static void
-app_recv_place_end (void *cls,
- struct GNUNET_CLIENT_MANAGER_Connection *client,
- const struct GNUNET_MessageHeader *msg)
+handle_app_place_end (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
- struct GNUNET_SOCIAL_App *
- app = GNUNET_CLIENT_MANAGER_get_user_context_ (client, sizeof (*app));
+ struct GNUNET_SOCIAL_App *app = cls;
if (NULL != app->connected_cb)
app->connected_cb (app->cb_cls);
@@ -999,110 +1007,6 @@
}
-static struct GNUNET_CLIENT_MANAGER_MessageHandler host_handlers[] =
-{
- { host_recv_enter_ack, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK,
- sizeof (struct HostEnterAck), GNUNET_NO },
-
- { host_recv_enter_request, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
- sizeof (struct GNUNET_PSYC_JoinRequestMessage), GNUNET_YES },
-
- { host_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
-
- { place_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { place_recv_history_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
-
-
-static struct GNUNET_CLIENT_MANAGER_MessageHandler guest_handlers[] =
-{
- { guest_recv_enter_ack, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK,
- sizeof (struct GNUNET_PSYC_CountersResultMessage), GNUNET_NO },
-
- { host_recv_enter_request, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
- sizeof (struct GNUNET_PSYC_JoinRequestMessage), GNUNET_YES },
-
- { place_recv_message, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
- sizeof (struct GNUNET_PSYC_MessageHeader), GNUNET_YES },
-
- { place_recv_message_ack, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { guest_recv_join_decision, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
- sizeof (struct GNUNET_PSYC_JoinDecisionMessage), GNUNET_YES },
-
- { place_recv_history_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_state_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { place_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
-
-
-static struct GNUNET_CLIENT_MANAGER_MessageHandler app_handlers[] =
-{
- { app_recv_ego, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO,
- sizeof (struct AppEgoMessage), GNUNET_YES },
-
- { app_recv_ego_end, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { app_recv_place, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE,
- sizeof (struct AppPlaceMessage), GNUNET_NO },
-
- { app_recv_place_end, NULL,
- GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END,
- sizeof (struct GNUNET_MessageHeader), GNUNET_NO },
-
- { app_recv_result, NULL,
- GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
- sizeof (struct GNUNET_OperationResultMessage), GNUNET_YES },
-
- { app_recv_disconnect, NULL, 0, 0, GNUNET_NO },
-
- { NULL, NULL, 0, 0, GNUNET_NO }
-};
-
-
static void
place_cleanup (struct GNUNET_SOCIAL_Place *plc)
{
@@ -1114,18 +1018,26 @@
GNUNET_h2s (&place_pub_hash));
if (NULL != plc->tmit)
+ {
GNUNET_PSYC_transmit_destroy (plc->tmit);
- if (NULL != plc->connect_msg)
- GNUNET_free (plc->connect_msg);
+ plc->tmit = NULL;
+ }
+ if (NULL != plc->connect_env)
+ {
+ GNUNET_MQ_discard (plc->connect_env);
+ plc->connect_env = NULL;
+ }
if (NULL != plc->disconnect_cb)
+ {
plc->disconnect_cb (plc->disconnect_cls);
+ plc->disconnect_cb = NULL;
+ }
}
static void
-host_cleanup (void *cls)
+host_cleanup (struct GNUNET_SOCIAL_Host *hst)
{
- struct GNUNET_SOCIAL_Host *hst = cls;
place_cleanup (&hst->plc);
if (NULL != hst->slicer)
{
@@ -1137,9 +1049,8 @@
static void
-guest_cleanup (void *cls)
+guest_cleanup (struct GNUNET_SOCIAL_Guest *gst)
{
- struct GNUNET_SOCIAL_Guest *gst = cls;
place_cleanup (&gst->plc);
GNUNET_free (gst);
}
@@ -1147,7 +1058,104 @@
/*** HOST ***/
+
+static void
+host_connect (struct GNUNET_SOCIAL_Host *hst);
+
+
+static void
+host_reconnect (void *cls)
+{
+ host_connect (cls);
+}
+
+
/**
+ * Host client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
+static void
+host_disconnected (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_SOCIAL_Host *hst = cls;
+ struct GNUNET_SOCIAL_Place *plc = &hst->plc;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Host client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
+ if (NULL != plc->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (plc->tmit);
+ plc->tmit = NULL;
+ }
+
+ plc->reconnect_task = GNUNET_SCHEDULER_add_delayed (plc->reconnect_delay,
+ host_reconnect,
+ hst);
+ plc->reconnect_delay = GNUNET_TIME_STD_BACKOFF (plc->reconnect_delay);
+}
+
+
+static void
+host_connect (struct GNUNET_SOCIAL_Host *hst)
+{
+ struct GNUNET_SOCIAL_Place *plc = &hst->plc;
+
+ GNUNET_MQ_hd_fixed_size (host_enter_ack,
+ GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK,
+ struct HostEnterAck);
+
+ GNUNET_MQ_hd_var_size (host_enter_request,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
+ struct GNUNET_PSYC_JoinRequestMessage);
+
+ GNUNET_MQ_hd_var_size (host_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader);
+
+ GNUNET_MQ_hd_fixed_size (place_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (place_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (place_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (place_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage);
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_host_enter_ack_handler (hst),
+ make_host_enter_request_handler (hst),
+ make_host_message_handler (plc),
+ make_place_message_ack_handler (plc),
+ make_place_history_result_handler (plc),
+ make_place_state_result_handler (plc),
+ make_place_result_handler (plc),
+ GNUNET_MQ_handler_end ()
+ };
+
+ plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+ handlers, host_disconnected, hst);
+ GNUNET_assert (NULL != plc->mq);
+ plc->tmit = GNUNET_PSYC_transmit_create (plc->mq);
+
+ GNUNET_MQ_send_copy (plc->mq, plc->connect_env);
+}
+
+
+/**
* Enter a place as host.
*
* A place is created upon first entering, and it is active until permanently
@@ -1194,11 +1202,8 @@
hst->farewell_cb = farewell_cb;
hst->cb_cls = cls;
- plc->client = GNUNET_CLIENT_MANAGER_connect (plc->cfg, "social",
host_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (plc->client, hst, sizeof (*plc));
+ plc->op = GNUNET_OP_create ();
- plc->tmit = GNUNET_PSYC_transmit_create (plc->client);
-
hst->slicer = GNUNET_PSYC_slicer_create ();
GNUNET_PSYC_slicer_method_add (hst->slicer, "_notice_place_leave", NULL,
host_recv_notice_place_leave_method,
@@ -1206,16 +1211,14 @@
NULL, host_recv_notice_place_leave_eom, hst);
uint16_t app_id_size = strlen (app->id) + 1;
- struct HostEnterRequest *hreq = GNUNET_malloc (sizeof (*hreq) + app_id_size);
- hreq->header.size = htons (sizeof (*hreq) + app_id_size);
- hreq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER);
+ struct HostEnterRequest *hreq;
+ plc->connect_env = GNUNET_MQ_msg_extra (hreq, app_id_size,
+
GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER);
hreq->policy = policy;
hreq->ego_pub_key = ego->pub_key;
GNUNET_memcpy (&hreq[1], app->id, app_id_size);
- plc->connect_msg = &hreq->header;
- place_send_connect_msg (plc);
-
+ host_connect (hst);
return hst;
}
@@ -1250,9 +1253,6 @@
struct GNUNET_SOCIAL_Host *hst = GNUNET_malloc (sizeof (*hst));
struct GNUNET_SOCIAL_Place *plc = &hst->plc;
- size_t app_id_size = strlen (hconn->app->id) + 1;
- struct HostEnterRequest *hreq = GNUNET_malloc (sizeof (*hreq) + app_id_size);
-
hst->enter_cb = enter_cb;
hst->answer_door_cb = answer_door_cb;
hst->farewell_cb = farewell_cb;
@@ -1264,11 +1264,8 @@
plc->pub_key = hconn->plc_msg.place_pub_key;
plc->ego_pub_key = hconn->plc_msg.ego_pub_key;
- plc->client = GNUNET_CLIENT_MANAGER_connect (plc->cfg, "social",
host_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (plc->client, hst, sizeof (*plc));
+ plc->op = GNUNET_OP_create ();
- plc->tmit = GNUNET_PSYC_transmit_create (plc->client);
-
hst->slicer = GNUNET_PSYC_slicer_create ();
GNUNET_PSYC_slicer_method_add (hst->slicer, "_notice_place_leave", NULL,
host_recv_notice_place_leave_method,
@@ -1275,15 +1272,15 @@
host_recv_notice_place_leave_modifier,
NULL, host_recv_notice_place_leave_eom, hst);
- hreq->header.size = htons (sizeof (*hreq) + app_id_size);
- hreq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER);
+ size_t app_id_size = strlen (hconn->app->id) + 1;
+ struct HostEnterRequest *hreq;
+ plc->connect_env = GNUNET_MQ_msg_extra (hreq, app_id_size,
+
GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER);
hreq->place_pub_key = hconn->plc_msg.place_pub_key;
hreq->ego_pub_key = hconn->plc_msg.ego_pub_key;
GNUNET_memcpy (&hreq[1], hconn->app->id, app_id_size);
- plc->connect_msg = &hreq->header;
- place_send_connect_msg (plc);
-
+ host_connect (hst);
return hst;
}
@@ -1316,6 +1313,7 @@
int is_admitted,
const struct GNUNET_PSYC_Message
*entry_resp)
{
+ struct GNUNET_SOCIAL_Place *plc = &hst->plc;
struct GNUNET_PSYC_JoinDecisionMessage *dcsn;
uint16_t entry_resp_size
= (NULL != entry_resp) ? ntohs (entry_resp->header.size) : 0;
@@ -1323,9 +1321,9 @@
if (GNUNET_MULTICAST_FRAGMENT_MAX_PAYLOAD < sizeof (*dcsn) + entry_resp_size)
return GNUNET_SYSERR;
- dcsn = GNUNET_malloc (sizeof (*dcsn) + entry_resp_size);
- dcsn->header.size = htons (sizeof (*dcsn) + entry_resp_size);
- dcsn->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (dcsn, entry_resp_size,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION);
dcsn->is_admitted = htonl (is_admitted);
dcsn->slave_pub_key = nym->pub_key;
@@ -1332,8 +1330,7 @@
if (0 < entry_resp_size)
GNUNET_memcpy (&dcsn[1], entry_resp, entry_resp_size);
- GNUNET_CLIENT_MANAGER_transmit (hst->plc.client, &dcsn->header);
- GNUNET_free (dcsn);
+ GNUNET_MQ_send (plc->mq, env);
return GNUNET_OK;
}
@@ -1524,10 +1521,11 @@
void
place_leave (struct GNUNET_SOCIAL_Place *plc)
{
- struct GNUNET_MessageHeader msg;
- msg.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE);
- msg.size = htons (sizeof (msg));
- GNUNET_CLIENT_MANAGER_transmit (plc->client, &msg);
+ struct GNUNET_MessageHeader *msg;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE);
+
+ GNUNET_MQ_send (plc->mq, env);
}
@@ -1539,10 +1537,12 @@
plc->disconnect_cb = disconnect_cb;
plc->disconnect_cls = disconnect_cls;
- GNUNET_CLIENT_MANAGER_disconnect (plc->client, GNUNET_YES,
- GNUNET_YES == plc->is_host
- ? host_cleanup : guest_cleanup,
- plc);
+ // FIXME: wait till queued messages are sent
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
}
@@ -1560,6 +1560,7 @@
void *cls)
{
place_disconnect (&hst->plc, disconnect_cb, cls);
+ host_cleanup (hst);
}
@@ -1595,7 +1596,104 @@
/*** GUEST ***/
-static struct GuestEnterRequest *
+
+static void
+guest_connect (struct GNUNET_SOCIAL_Guest *gst);
+
+
+static void
+guest_reconnect (void *cls)
+{
+ guest_connect (cls);
+}
+
+
+/**
+ * Guest client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
+static void
+guest_disconnected (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_SOCIAL_Guest *gst = cls;
+ struct GNUNET_SOCIAL_Place *plc = &gst->plc;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Guest client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
+ if (NULL != plc->tmit)
+ {
+ GNUNET_PSYC_transmit_destroy (plc->tmit);
+ plc->tmit = NULL;
+ }
+
+ plc->reconnect_task = GNUNET_SCHEDULER_add_delayed (plc->reconnect_delay,
+ guest_reconnect,
+ gst);
+ plc->reconnect_delay = GNUNET_TIME_STD_BACKOFF (plc->reconnect_delay);
+}
+
+
+static void
+guest_connect (struct GNUNET_SOCIAL_Guest *gst)
+{
+ struct GNUNET_SOCIAL_Place *plc = &gst->plc;
+
+ GNUNET_MQ_hd_fixed_size (guest_enter_ack,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK,
+ struct GNUNET_PSYC_CountersResultMessage);
+
+ GNUNET_MQ_hd_var_size (guest_enter_decision,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
+ struct GNUNET_PSYC_JoinDecisionMessage);
+
+ GNUNET_MQ_hd_var_size (place_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader);
+
+ GNUNET_MQ_hd_fixed_size (place_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (place_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (place_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage);
+
+ GNUNET_MQ_hd_var_size (place_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage);
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_guest_enter_ack_handler (gst),
+ make_guest_enter_decision_handler (gst),
+ make_place_message_handler (plc),
+ make_place_message_ack_handler (plc),
+ make_place_history_result_handler (plc),
+ make_place_state_result_handler (plc),
+ make_place_result_handler (plc),
+ GNUNET_MQ_handler_end ()
+ };
+
+ plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+ handlers, guest_disconnected, gst);
+ GNUNET_assert (NULL != plc->mq);
+ plc->tmit = GNUNET_PSYC_transmit_create (plc->mq);
+
+ GNUNET_MQ_send_copy (plc->mq, plc->connect_env);
+}
+
+
+static struct GNUNET_MQ_Envelope *
guest_enter_request_create (const char *app_id,
const struct GNUNET_CRYPTO_EcdsaPublicKey
*ego_pub_key,
const struct GNUNET_CRYPTO_EddsaPublicKey
*place_pub_key,
@@ -1608,11 +1706,10 @@
uint16_t join_msg_size = ntohs (join_msg->header.size);
uint16_t relay_size = relay_count * sizeof (*relays);
- struct GuestEnterRequest *
- greq = GNUNET_malloc (sizeof (*greq) + app_id_size + relay_size +
join_msg_size);
-
- greq->header.size = htons (sizeof (*greq) + app_id_size + relay_size +
join_msg_size);
- greq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER);
+ struct GuestEnterRequest *greq;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (greq, app_id_size + relay_size + join_msg_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER);
greq->place_pub_key = *place_pub_key;
greq->ego_pub_key = *ego_pub_key;
greq->origin = *origin;
@@ -1629,7 +1726,7 @@
}
GNUNET_memcpy (p, join_msg, join_msg_size);
- return greq;
+ return env;
}
@@ -1686,20 +1783,17 @@
plc->is_host = GNUNET_NO;
plc->slicer = slicer;
+ plc->op = GNUNET_OP_create ();
+
+ plc->connect_env
+ = guest_enter_request_create (app->id, &ego->pub_key, &plc->pub_key,
+ origin, relay_count, relays, entry_msg);
+
gst->enter_cb = local_enter_cb;
gst->entry_dcsn_cb = entry_dcsn_cb;
gst->cb_cls = cls;
- plc->client = GNUNET_CLIENT_MANAGER_connect (plc->cfg, "social",
guest_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (plc->client, gst, sizeof (*plc));
-
- plc->tmit = GNUNET_PSYC_transmit_create (plc->client);
-
- struct GuestEnterRequest *
- greq = guest_enter_request_create (app->id, &ego->pub_key, &plc->pub_key,
- origin, relay_count, relays, entry_msg);
- plc->connect_msg = &greq->header;
- place_send_connect_msg (plc);
+ guest_connect (gst);
return gst;
}
@@ -1755,11 +1849,12 @@
if (NULL != join_msg)
join_msg_size = ntohs (join_msg->header.size);
- uint16_t greq_size = sizeof (struct GuestEnterByNameRequest)
- + app_id_size + gns_name_size + password_size + join_msg_size;
- struct GuestEnterByNameRequest *greq = GNUNET_malloc (greq_size);
- greq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_BY_NAME);
- greq->header.size = htons (greq_size);
+ struct GuestEnterByNameRequest *greq;
+ plc->connect_env
+ = GNUNET_MQ_msg_extra (greq, app_id_size + gns_name_size
+ + password_size + join_msg_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_BY_NAME);
+
greq->ego_pub_key = ego->pub_key;
char *p = (char *) &greq[1];
@@ -1772,23 +1867,18 @@
if (NULL != join_msg)
GNUNET_memcpy (p, join_msg, join_msg_size);
- gst->enter_cb = local_enter_cb;
- gst->entry_dcsn_cb = entry_decision_cb;
- gst->cb_cls = cls;
-
plc->ego_pub_key = ego->pub_key;
plc->cfg = app->cfg;
plc->is_host = GNUNET_NO;
plc->slicer = slicer;
- plc->client = GNUNET_CLIENT_MANAGER_connect (app->cfg, "social",
guest_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (plc->client, gst, sizeof (*plc));
+ plc->op = GNUNET_OP_create ();
- plc->tmit = GNUNET_PSYC_transmit_create (plc->client);
+ gst->enter_cb = local_enter_cb;
+ gst->entry_dcsn_cb = entry_decision_cb;
+ gst->cb_cls = cls;
- plc->connect_msg = &greq->header;
- place_send_connect_msg (plc);
-
+ guest_connect (gst);
return gst;
}
@@ -1821,10 +1911,10 @@
struct GNUNET_SOCIAL_Place *plc = &gst->plc;
uint16_t app_id_size = strlen (gconn->app->id) + 1;
- uint16_t greq_size = sizeof (struct GuestEnterRequest) + app_id_size;
- struct GuestEnterRequest *greq = GNUNET_malloc (greq_size);
- greq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER);
- greq->header.size = htons (greq_size);
+ struct GuestEnterRequest *greq;
+ plc->connect_env
+ = GNUNET_MQ_msg_extra (greq, app_id_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER);
greq->ego_pub_key = gconn->plc_msg.ego_pub_key;
greq->place_pub_key = gconn->plc_msg.place_pub_key;
greq->flags = htonl (flags);
@@ -1831,9 +1921,6 @@
GNUNET_memcpy (&greq[1], gconn->app->id, app_id_size);
- gst->enter_cb = local_enter_cb;
- gst->cb_cls = cls;
-
plc->cfg = gconn->app->cfg;
plc->is_host = GNUNET_NO;
plc->slicer = slicer;
@@ -1840,14 +1927,12 @@
plc->pub_key = gconn->plc_msg.place_pub_key;
plc->ego_pub_key = gconn->plc_msg.ego_pub_key;
- plc->client = GNUNET_CLIENT_MANAGER_connect (plc->cfg, "social",
guest_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (plc->client, gst, sizeof (*plc));
+ plc->op = GNUNET_OP_create ();
- plc->tmit = GNUNET_PSYC_transmit_create (plc->client);
+ gst->enter_cb = local_enter_cb;
+ gst->cb_cls = cls;
- plc->connect_msg = &greq->header;
- place_send_connect_msg (plc);
-
+ guest_connect (gst);
return gst;
}
@@ -1931,6 +2016,7 @@
void *cls)
{
place_disconnect (&gst->plc, disconnect_cb, cls);
+ guest_cleanup (gst);
}
@@ -2015,15 +2101,14 @@
GNUNET_SERVER_MAX_MESSAGE_SIZE
- sizeof (*mpreq)) + 1;
GNUNET_assert ('\0' == method_prefix[method_size - 1]);
- mpreq = GNUNET_malloc (sizeof (*mpreq) + method_size);
- mpreq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET);
- mpreq->header.size = htons (sizeof (*mpreq) + method_size);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (mpreq, method_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET);
mpreq->flags = htonl (flags);
GNUNET_memcpy (&mpreq[1], method_prefix, method_size);
- GNUNET_CLIENT_MANAGER_transmit (plc->client, &mpreq->header);
- GNUNET_free (mpreq);
+ GNUNET_MQ_send (plc->mq, env);
}
@@ -2033,10 +2118,11 @@
void
GNUNET_SOCIAL_place_msg_proc_clear (struct GNUNET_SOCIAL_Place *plc)
{
- struct GNUNET_MessageHeader req;
- req.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR);
- req.size = htons (sizeof (req));
- GNUNET_CLIENT_MANAGER_transmit (plc->client, &req);
+ struct GNUNET_MessageHeader *req;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (req, GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR);
+
+ GNUNET_MQ_send (plc->mq, env);
}
@@ -2057,8 +2143,7 @@
hist->slicer = slicer;
hist->result_cb = result_cb;
hist->cls = cls;
- hist->op_id = GNUNET_CLIENT_MANAGER_op_add (plc->client,
- &op_recv_history_result, hist);
+ hist->op_id = GNUNET_OP_add (plc->op, op_recv_history_result, hist, NULL);
GNUNET_assert (NULL != method_prefix);
uint16_t method_size = strnlen (method_prefix,
@@ -2065,9 +2150,10 @@
GNUNET_SERVER_MAX_MESSAGE_SIZE
- sizeof (*req)) + 1;
GNUNET_assert ('\0' == method_prefix[method_size - 1]);
- req = GNUNET_malloc (sizeof (*req) + method_size);
- req->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
- req->header.size = htons (sizeof (*req) + method_size);
+
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, method_size,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY);
req->start_message_id = GNUNET_htonll (start_message_id);
req->end_message_id = GNUNET_htonll (end_message_id);
req->message_limit = GNUNET_htonll (message_limit);
@@ -2075,8 +2161,7 @@
req->op_id = GNUNET_htonll (hist->op_id);
GNUNET_memcpy (&req[1], method_prefix, method_size);
- GNUNET_CLIENT_MANAGER_transmit (plc->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (plc->mq, env);
return hist;
}
@@ -2165,7 +2250,7 @@
void
GNUNET_SOCIAL_place_history_replay_cancel (struct GNUNET_SOCIAL_HistoryRequest
*hist)
{
- GNUNET_CLIENT_MANAGER_op_cancel (hist->plc->client, hist->op_id);
+ GNUNET_OP_remove (hist->plc->op, hist->op_id);
GNUNET_free (hist);
}
@@ -2185,20 +2270,17 @@
look->var_cb = var_cb;
look->result_cb = result_cb;
look->cls = cls;
- look->op_id = GNUNET_CLIENT_MANAGER_op_add (plc->client,
- &op_recv_state_result, look);
+ look->op_id = GNUNET_OP_add (plc->op, &op_recv_state_result, look, NULL);
GNUNET_assert (NULL != name);
size_t name_size = strnlen (name, GNUNET_SERVER_MAX_MESSAGE_SIZE
- sizeof (*req)) + 1;
- req = GNUNET_malloc (sizeof (*req) + name_size);
- req->header.type = htons (type);
- req->header.size = htons (sizeof (*req) + name_size);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (req, name_size, type);
req->op_id = GNUNET_htonll (look->op_id);
GNUNET_memcpy (&req[1], name, name_size);
- GNUNET_CLIENT_MANAGER_transmit (plc->client, &req->header);
- GNUNET_free (req);
+ GNUNET_MQ_send (plc->mq, env);
return look;
}
@@ -2265,7 +2347,7 @@
void
GNUNET_SOCIAL_place_look_cancel (struct GNUNET_SOCIAL_LookHandle *look)
{
- GNUNET_CLIENT_MANAGER_op_cancel (look->plc->client, look->op_id);
+ GNUNET_OP_remove (look->plc->op, look->op_id);
GNUNET_free (look);
}
@@ -2331,14 +2413,14 @@
size_t name_size = strlen (name) + 1;
size_t password_size = strlen (password) + 1;
size_t relay_size = relay_count * sizeof (*relays);
- size_t preq_size = sizeof (*preq) + name_size + password_size + relay_size;
+ size_t payload_size = name_size + password_size + relay_size;
- if (GNUNET_SERVER_MAX_MESSAGE_SIZE < preq_size)
+ if (GNUNET_SERVER_MAX_MESSAGE_SIZE < sizeof (*preq) + payload_size)
return GNUNET_SYSERR;
- preq = GNUNET_malloc (preq_size);
- preq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_PLACE);
- preq->header.size = htons (preq_size);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (preq, payload_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_PLACE);
preq->expiration_time = GNUNET_htonll (expiration_time.abs_value_us);
preq->ego_pub_key = ego->pub_key;
preq->place_pub_key = *place_pub_key;
@@ -2357,10 +2439,11 @@
add_plc->result_cb = result_cb;
add_plc->result_cls = result_cls;
- preq->op_id = GNUNET_htonll (GNUNET_CLIENT_MANAGER_op_add (app->client,
-
op_recv_zone_add_place_result,
- add_plc));
- GNUNET_CLIENT_MANAGER_transmit_now (app->client, &preq->header);
+ preq->op_id = GNUNET_htonll (GNUNET_OP_add (app->op,
+ op_recv_zone_add_place_result,
+ add_plc, NULL));
+
+ GNUNET_MQ_send (app->mq, env);
return GNUNET_OK;
}
@@ -2376,7 +2459,6 @@
if (NULL != add_nym->result_cb)
add_nym->result_cb (add_nym->result_cls, result, err_msg, err_msg_size);
- GNUNET_free (add_nym->req);
GNUNET_free (add_nym);
}
@@ -2417,28 +2499,107 @@
if (GNUNET_SERVER_MAX_MESSAGE_SIZE < sizeof (*nreq) + name_size)
return GNUNET_SYSERR;
- nreq = GNUNET_malloc (sizeof (*nreq) + name_size);
- nreq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_NYM);
- nreq->header.size = htons (sizeof (*nreq) + name_size);
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg_extra (nreq, name_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_NYM);
nreq->expiration_time = GNUNET_htonll (expiration_time.abs_value_us);
nreq->ego_pub_key = ego->pub_key;
nreq->nym_pub_key = *nym_pub_key;
GNUNET_memcpy (&nreq[1], name, name_size);
- struct ZoneAddNymHandle * add_nym = GNUNET_malloc (sizeof (*add_nym));
- add_nym->req = nreq;
+ struct ZoneAddNymHandle *add_nym = GNUNET_malloc (sizeof (*add_nym));
add_nym->result_cb = result_cb;
add_nym->result_cls = result_cls;
- nreq->op_id = GNUNET_htonll (GNUNET_CLIENT_MANAGER_op_add (app->client,
-
op_recv_zone_add_nym_result,
- add_nym));
- GNUNET_CLIENT_MANAGER_transmit_now (app->client, &nreq->header);
+ nreq->op_id = GNUNET_htonll (GNUNET_OP_add (app->op,
+ op_recv_zone_add_nym_result,
+ add_nym, NULL));
+
+ GNUNET_MQ_send (app->mq, env);
return GNUNET_OK;
}
+/*** APP ***/
+
+
+static void
+app_connect (struct GNUNET_SOCIAL_App *app);
+
+
+static void
+app_reconnect (void *cls)
+{
+ app_connect (cls);
+}
+
+
/**
+ * App client disconnected from service.
+ *
+ * Reconnect after backoff period.
+ */
+static void
+app_disconnected (void *cls, enum GNUNET_MQ_Error error)
+{
+ struct GNUNET_SOCIAL_App *app = cls;
+
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "App client disconnected (%d), re-connecting\n",
+ (int) error);
+ if (NULL != app->mq)
+ {
+ GNUNET_MQ_destroy (app->mq);
+ app->mq = NULL;
+ }
+
+ app->reconnect_task = GNUNET_SCHEDULER_add_delayed (app->reconnect_delay,
+ app_reconnect,
+ app);
+ app->reconnect_delay = GNUNET_TIME_STD_BACKOFF (app->reconnect_delay);
+}
+
+
+static void
+app_connect (struct GNUNET_SOCIAL_App *app)
+{
+ GNUNET_MQ_hd_var_size (app_ego,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO,
+ struct AppEgoMessage);
+
+ GNUNET_MQ_hd_fixed_size (app_ego_end,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (app_place,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE,
+ struct AppPlaceMessage);
+
+ GNUNET_MQ_hd_fixed_size (app_place_end,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END,
+ struct GNUNET_MessageHeader);
+
+ GNUNET_MQ_hd_var_size (app_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage);
+
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ make_app_ego_handler (app),
+ make_app_ego_end_handler (app),
+ make_app_place_handler (app),
+ make_app_place_end_handler (app),
+ make_app_result_handler (app),
+ GNUNET_MQ_handler_end ()
+ };
+
+ app->mq = GNUNET_CLIENT_connecT (app->cfg, "social",
+ handlers, app_disconnected, app);
+ GNUNET_assert (NULL != app->mq);
+ GNUNET_MQ_send_copy (app->mq, app->connect_env);
+}
+
+
+/**
* Connect application to the social service.
*
* The @host_place_cb and @guest_place_cb functions are
@@ -2482,21 +2643,16 @@
app->connected_cb = connected_cb;
app->cb_cls = cls;
app->egos = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
- app->client = GNUNET_CLIENT_MANAGER_connect (cfg, "social",
- app_handlers);
- GNUNET_CLIENT_MANAGER_set_user_context_ (app->client, app, sizeof (*app));
-
+ app->op = GNUNET_OP_create ();
app->id = GNUNET_malloc (app_id_size);
GNUNET_memcpy (app->id, id, app_id_size);
- struct AppConnectRequest *creq = GNUNET_malloc (sizeof (*creq) +
app_id_size);
- creq->header.size = htons (sizeof (*creq) + app_id_size);
- creq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_CONNECT);
+ struct AppConnectRequest *creq;
+ app->connect_env = GNUNET_MQ_msg_extra (creq, app_id_size,
+
GNUNET_MESSAGE_TYPE_SOCIAL_APP_CONNECT);
GNUNET_memcpy (&creq[1], app->id, app_id_size);
- app->connect_msg = &creq->header;
- app_send_connect_msg (app);
-
+ app_connect (app);
return app;
}
@@ -2516,8 +2672,15 @@
GNUNET_ContinuationCallback disconnect_cb,
void *disconnect_cls)
{
- GNUNET_CLIENT_MANAGER_disconnect (app->client, GNUNET_NO,
- disconnect_cb, disconnect_cls);
+ // FIXME: wait till queued messages are sent
+ if (NULL != app->mq)
+ {
+ GNUNET_MQ_destroy (app->mq);
+ app->mq = NULL;
+ }
+
+ if (NULL != disconnect_cb)
+ disconnect_cb (disconnect_cls);
}
@@ -2538,11 +2701,12 @@
GNUNET_SOCIAL_app_detach (struct GNUNET_SOCIAL_App *app,
struct GNUNET_SOCIAL_Place *plc)
{
- struct AppDetachRequest dreq;
- dreq.header.size = htons (sizeof (dreq));
- dreq.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH);
- dreq.place_pub_key = plc->pub_key;
- GNUNET_CLIENT_MANAGER_transmit_now (plc->client, &dreq.header);
+ struct AppDetachRequest *dreq;
+ struct GNUNET_MQ_Envelope *
+ env = GNUNET_MQ_msg (dreq, GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH);
+ dreq->place_pub_key = plc->pub_key;
+
+ GNUNET_MQ_send (app->mq, env);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37729 - in gnunet/src: include multicast psyc psycstore psycutil social,
gnunet <=