struct ZoneAddPlaceHandle
{
- struct ZoneAddPlaceRequest *req;
GNUNET_ResultCallback result_cb;
void *result_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)
+ {
+ GNUNET_break_op (0);
+ LOG (GNUNET_ERROR_TYPE_WARNING,
+ "Invalid modifier in state result\n");
+ return GNUNET_SYSERR;
+ }
- if (NULL == mod || size - sizeof (*res) != mod_size)
+ uint16_t size = ntohs (res->header.size);
+ uint16_t mod_size = ntohs (mod->size);
+ if (size - sizeof (*res) != mod_size)
{
GNUNET_break_op (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
const char *name = (const char *) &pmod[1];
uint16_t name_size = ntohs (pmod->name_size);
- if ('\0' != name[name_size - 1])
+ if (0 == name_size
+ || mod_size - sizeof (*pmod) < name_size
+ || '\0' != name[name_size - 1])
{
GNUNET_break_op (0);
LOG (GNUNET_ERROR_TYPE_WARNING,
struct GNUNET_SOCIAL_Guest *gst = cls;
struct GNUNET_PSYC_Message *pmsg = NULL;
- if (ntohs (dcsn->header.size) <= sizeof (*dcsn) + sizeof (*pmsg))
+ if (ntohs (dcsn->header.size) > sizeof (*dcsn))
pmsg = (struct GNUNET_PSYC_Message *) GNUNET_MQ_extract_nested_mh (dcsn);
if (NULL != gst->entry_dcsn_cb)
}
+/*** CLEANUP / DISCONNECT ***/
+
+
+static void
+host_cleanup (struct GNUNET_SOCIAL_Host *hst)
+{
+ if (NULL != hst->slicer)
+ {
+ GNUNET_PSYC_slicer_destroy (hst->slicer);
+ hst->slicer = NULL;
+ }
+ GNUNET_free (hst);
+}
+
+
+static void
+guest_cleanup (struct GNUNET_SOCIAL_Guest *gst)
+{
+ GNUNET_free (gst);
+}
+
+
static void
place_cleanup (struct GNUNET_SOCIAL_Place *plc)
{
GNUNET_MQ_discard (plc->connect_env);
plc->connect_env = NULL;
}
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
if (NULL != plc->disconnect_cb)
{
plc->disconnect_cb (plc->disconnect_cls);
plc->disconnect_cb = NULL;
}
+
+ (GNUNET_YES == plc->is_host)
+ ? host_cleanup ((struct GNUNET_SOCIAL_Host *) plc)
+ : guest_cleanup ((struct GNUNET_SOCIAL_Guest *) plc);
}
-static void
-host_cleanup (struct GNUNET_SOCIAL_Host *hst)
+void
+place_disconnect (struct GNUNET_SOCIAL_Place *plc,
+ GNUNET_ContinuationCallback cb,
+ void *cls)
{
- place_cleanup (&hst->plc);
- if (NULL != hst->slicer)
+ plc->disconnect_cb = cb;
+ plc->disconnect_cls = cls;
+
+ if (NULL != plc->mq)
{
- GNUNET_PSYC_slicer_destroy (hst->slicer);
- hst->slicer = NULL;
+ struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (plc->mq);
+ if (NULL != env)
+ {
+ GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback) place_cleanup, plc);
+ }
+ else
+ {
+ place_cleanup (plc);
+ }
+ }
+ else
+ {
+ place_cleanup (plc);
}
- GNUNET_free (hst);
}
-static void
-guest_cleanup (struct GNUNET_SOCIAL_Guest *gst)
+void
+place_leave (struct GNUNET_SOCIAL_Place *plc)
{
- place_cleanup (&gst->plc);
- GNUNET_free (gst);
+ 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);
}
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;
}
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
plc->reconnect_task = GNUNET_SCHEDULER_add_delayed (plc->reconnect_delay,
host_reconnect,
{
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_hd_fixed_size (host_enter_ack,
+ GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK,
+ struct HostEnterAck,
+ hst),
+ GNUNET_MQ_hd_var_size (host_enter_request,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_REQUEST,
+ struct GNUNET_PSYC_JoinRequestMessage,
+ hst),
+ GNUNET_MQ_hd_var_size (host_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader,
+ hst),
+ GNUNET_MQ_hd_fixed_size (place_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader,
+ plc),
+ GNUNET_MQ_hd_var_size (place_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage,
+ plc),
+ GNUNET_MQ_hd_var_size (place_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage,
+ plc),
+ GNUNET_MQ_hd_var_size (place_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage,
+ plc),
GNUNET_MQ_handler_end ()
};
- plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+ 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);
}
-void
-place_leave (struct GNUNET_SOCIAL_Place *plc)
-{
- 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);
-}
-
-
-void
-place_disconnect (struct GNUNET_SOCIAL_Place *plc,
- GNUNET_ContinuationCallback disconnect_cb,
- void *disconnect_cls)
-{
- plc->disconnect_cb = disconnect_cb;
- plc->disconnect_cls = disconnect_cls;
-
- // FIXME: wait till queued messages are sent
- if (NULL != plc->mq)
- {
- GNUNET_MQ_destroy (plc->mq);
- plc->mq = NULL;
- }
-}
-
-
/**
* Disconnect from a home.
*
void *cls)
{
place_disconnect (&hst->plc, disconnect_cb, cls);
- host_cleanup (hst);
}
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;
}
+ if (NULL != plc->mq)
+ {
+ GNUNET_MQ_destroy (plc->mq);
+ plc->mq = NULL;
+ }
plc->reconnect_task = GNUNET_SCHEDULER_add_delayed (plc->reconnect_delay,
guest_reconnect,
{
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_hd_fixed_size (guest_enter_ack,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK,
+ struct GNUNET_PSYC_CountersResultMessage,
+ gst),
+ GNUNET_MQ_hd_var_size (guest_enter_decision,
+ GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION,
+ struct GNUNET_PSYC_JoinDecisionMessage,
+ gst),
+ GNUNET_MQ_hd_var_size (place_message,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE,
+ struct GNUNET_PSYC_MessageHeader,
+ plc),
+ GNUNET_MQ_hd_fixed_size (place_message_ack,
+ GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK,
+ struct GNUNET_MessageHeader,
+ plc),
+ GNUNET_MQ_hd_var_size (place_history_result,
+ GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT,
+ struct GNUNET_OperationResultMessage,
+ plc),
+ GNUNET_MQ_hd_var_size (place_state_result,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT,
+ struct GNUNET_OperationResultMessage,
+ plc),
+ GNUNET_MQ_hd_var_size (place_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage,
+ plc),
GNUNET_MQ_handler_end ()
};
- plc->mq = GNUNET_CLIENT_connecT (plc->cfg, "social",
+ 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);
void *cls)
{
place_disconnect (&gst->plc, disconnect_cb, cls);
- guest_cleanup (gst);
}
if (NULL != add_plc->result_cb)
add_plc->result_cb (add_plc->result_cls, result, err_msg, err_msg_size);
- GNUNET_free (add_plc->req);
GNUNET_free (add_plc);
}
GNUNET_memcpy (p, relays, relay_size);
struct ZoneAddPlaceHandle * add_plc = GNUNET_malloc (sizeof (*add_plc));
- add_plc->req = preq;
add_plc->result_cb = result_cb;
add_plc->result_cls = result_cls;
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_hd_var_size (app_ego,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO,
+ struct AppEgoMessage,
+ app),
+ GNUNET_MQ_hd_fixed_size (app_ego_end,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END,
+ struct GNUNET_MessageHeader,
+ app),
+ GNUNET_MQ_hd_var_size (app_place,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE,
+ struct AppPlaceMessage,
+ app),
+ GNUNET_MQ_hd_fixed_size (app_place_end,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END,
+ struct GNUNET_MessageHeader,
+ app),
+ GNUNET_MQ_hd_var_size (app_result,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE,
+ struct GNUNET_OperationResultMessage,
+ app),
GNUNET_MQ_handler_end ()
};
- app->mq = GNUNET_CLIENT_connecT (app->cfg, "social",
+ 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);
}
+static void
+app_cleanup (struct GNUNET_SOCIAL_App *app)
+{
+ if (NULL != app->mq)
+ {
+ GNUNET_MQ_destroy (app->mq);
+ app->mq = NULL;
+ }
+ if (NULL != app->disconnect_cb)
+ {
+ app->disconnect_cb (app->disconnect_cls);
+ app->disconnect_cb = NULL;
+ }
+ GNUNET_free (app);
+}
+
/**
* Disconnect application.
*
GNUNET_ContinuationCallback disconnect_cb,
void *disconnect_cls)
{
- // FIXME: wait till queued messages are sent
+ app->disconnect_cb = disconnect_cb;
+ app->disconnect_cls = disconnect_cls;
+
if (NULL != app->mq)
{
- GNUNET_MQ_destroy (app->mq);
- app->mq = NULL;
+ struct GNUNET_MQ_Envelope *env = GNUNET_MQ_get_last_envelope (app->mq);
+ if (NULL != env)
+ {
+ GNUNET_MQ_notify_sent (env, (GNUNET_SCHEDULER_TaskCallback) app_cleanup, app);
+ }
+ else
+ {
+ app_cleanup (app);
+ }
+ }
+ else
+ {
+ app_cleanup (app);
}
-
- if (NULL != disconnect_cb)
- disconnect_cb (disconnect_cls);
}
struct GNUNET_MQ_Envelope *
env = GNUNET_MQ_msg (dreq, GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH);
dreq->place_pub_key = plc->pub_key;
+ dreq->ego_pub_key = plc->ego_pub_key;
GNUNET_MQ_send (app->mq, env);
}
projects / oweals / gnunet.git / blobdiff