[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 27/64: Use MQ API instead of manually allocating m
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 27/64: Use MQ API instead of manually allocating messages; simplify logic in handle_client_psyc_message; cleanup |
|
Date: |
Sat, 30 Dec 2017 20:58:12 +0100 |
This is an automated email from the git hooks/post-receive script.
lurchi pushed a commit to branch master
in repository gnunet.
commit 6599b4d49d58831ec38bab64478266ebfd9c59fe
Author: lurchi <address@hidden>
AuthorDate: Mon Nov 13 20:45:48 2017 +0100
Use MQ API instead of manually allocating messages; simplify logic in
handle_client_psyc_message; cleanup
---
src/social/gnunet-service-social.c | 406 ++++++++++++++-----------------------
src/social/social_api.c | 36 +---
2 files changed, 152 insertions(+), 290 deletions(-)
diff --git a/src/social/gnunet-service-social.c
b/src/social/gnunet-service-social.c
index 609cdab06..3e527cbaf 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -501,9 +501,6 @@ cleanup_host (struct Host *hst)
static void
cleanup_guest (struct Guest *gst)
{
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "cleanup_guest, gst = %p\n",
- gst);
struct Place *plc = &gst->place;
struct GNUNET_CONTAINER_MultiHashMap *
plc_gst = GNUNET_CONTAINER_multihashmap_get (place_guests,
@@ -539,10 +536,6 @@ cleanup_place (void *cls)
{
struct Place *plc = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "%p Cleaning up place %s\n",
- plc, GNUNET_h2s (&plc->pub_key_hash));
-
(GNUNET_YES == plc->is_host)
? cleanup_host ((struct Host *) plc)
: cleanup_guest ((struct Guest *) plc);
@@ -621,36 +614,24 @@ client_notify_connect (void *cls,
/**
- * Send message to a client.
- */
-static inline void
-client_send_msg (struct GNUNET_SERVICE_Client *client,
- const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_MQ_Envelope *
- env = GNUNET_MQ_msg_copy (msg);
-
- GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
- env);
-}
-
-
-/**
- * Send message to all clients connected to a place.
+ * Send message to all clients connected to a place and
+ * takes care of freeing @env.
*/
static void
place_send_msg (const struct Place *plc,
- const struct GNUNET_MessageHeader *msg)
+ struct GNUNET_MQ_Envelope *env)
{
+ struct ClientListItem *cli = plc->clients_head;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Sending message to clients of place.\n", plc);
-
- struct ClientListItem *cli = plc->clients_head;
while (NULL != cli)
{
- client_send_msg (cli->client, msg);
+ GNUNET_MQ_send_copy (GNUNET_SERVICE_client_get_mq (cli->client),
+ env);
cli = cli->next;
}
+ GNUNET_MQ_discard (env);
}
@@ -672,23 +653,21 @@ static void
client_send_result (struct GNUNET_SERVICE_Client *client, uint64_t op_id,
int64_t result_code, const void *data, uint16_t data_size)
{
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_OperationResultMessage *res;
- res = GNUNET_malloc (sizeof (*res) + data_size);
- res->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE);
- res->header.size = htons (sizeof (*res) + data_size);
+ env = GNUNET_MQ_msg_extra (res,
+ data_size,
+ GNUNET_MESSAGE_TYPE_PSYC_RESULT_CODE);
res->result_code = GNUNET_htonll (result_code);
res->op_id = op_id;
if (0 < data_size)
GNUNET_memcpy (&res[1], data, data_size);
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Sending result to client for operation #%" PRIu64 ": "
"%" PRId64 " (size: %u)\n",
client, GNUNET_ntohll (op_id), result_code, data_size);
-
- client_send_msg (client, &res->header);
- GNUNET_free (res);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client), env);
}
@@ -696,19 +675,21 @@ static void
client_send_host_enter_ack (struct GNUNET_SERVICE_Client *client,
struct Host *hst, uint32_t result)
{
+ struct GNUNET_MQ_Envelope *env;
+ struct HostEnterAck *hack;
struct Place *plc = &hst->place;
- struct HostEnterAck hack;
- hack.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK);
- hack.header.size = htons (sizeof (hack));
- hack.result_code = htonl (result);
- hack.max_message_id = GNUNET_htonll (plc->max_message_id);
- hack.place_pub_key = plc->pub_key;
+ env = GNUNET_MQ_msg (hack,
+ GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK);
+ hack->result_code = htonl (result);
+ hack->max_message_id = GNUNET_htonll (plc->max_message_id);
+ hack->place_pub_key = plc->pub_key;
if (NULL != client)
- client_send_msg (client, &hack.header);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
else
- place_send_msg (plc, &hack.header);
+ place_send_msg (plc, env);
}
@@ -742,7 +723,8 @@ psyc_recv_join_request (void *cls,
GNUNET_CRYPTO_hash (slave_key, sizeof (*slave_key), &slave_key_hash);
GNUNET_CONTAINER_multihashmap_put (hst->join_reqs, &slave_key_hash, jh,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- place_send_msg (&hst->place, &req->header);
+ place_send_msg (&hst->place,
+ GNUNET_MQ_msg_copy (&req->header));
}
@@ -752,18 +734,18 @@ psyc_recv_join_request (void *cls,
static void
psyc_slave_connected (void *cls, int result, uint64_t max_message_id)
{
+ struct GNUNET_PSYC_CountersResultMessage *res;
+ struct GNUNET_MQ_Envelope *env;
struct Guest *gst = cls;
struct Place *plc = &gst->place;
+
plc->max_message_id = max_message_id;
plc->is_ready = GNUNET_YES;
-
- struct GNUNET_PSYC_CountersResultMessage res;
- res.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK);
- res.header.size = htons (sizeof (res));
- res.result_code = htonl (result);
- res.max_message_id = GNUNET_htonll (plc->max_message_id);
-
- place_send_msg (plc, &res.header);
+ env = GNUNET_MQ_msg (res,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK);
+ res->result_code = htonl (result);
+ res->max_message_id = GNUNET_htonll (plc->max_message_id);
+ place_send_msg (plc, env);
}
@@ -777,7 +759,7 @@ psyc_recv_join_dcsn (void *cls,
const struct GNUNET_PSYC_Message *join_msg)
{
struct Guest *gst = cls;
- place_send_msg (&gst->place, &dcsn->header);
+ place_send_msg (&gst->place, GNUNET_MQ_msg_copy (&dcsn->header));
}
@@ -798,7 +780,7 @@ psyc_recv_message (void *cls,
GNUNET_PSYC_slicer_message (plc->slicer, msg);
- place_send_msg (plc, &msg->header);
+ place_send_msg (plc, GNUNET_MQ_msg_copy (&msg->header));
}
@@ -1180,8 +1162,6 @@ app_place_add (const char *app_id,
if (GNUNET_SYSERR == place_add (ereq))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "could not add place\n");
return GNUNET_SYSERR;
}
@@ -1191,32 +1171,6 @@ app_place_add (const char *app_id,
GNUNET_break (0);
return GNUNET_SYSERR;
}
-
- //struct GNUNET_HashCode place_pub_hash;
- //GNUNET_CRYPTO_hash (&ereq->place_pub_key, sizeof (ereq->place_pub_key),
&place_pub_hash);
-
- //struct GNUNET_CONTAINER_MultiHashMap *
- // place_apps = GNUNET_CONTAINER_multihashmap_get (places_apps,
&place_pub_hash);
- //if (NULL == place_apps)
- //{
- // place_apps = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO);
- // if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (places_apps,
&place_pub_hash, place_apps,
- //
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST))
- // {
- // GNUNET_break (0);
- // }
- //}
-
- //size_t app_id_size = strlen (app_id) + 1;
- //void *app_id_value = GNUNET_malloc (app_id_size);
- //GNUNET_memcpy (app_id_value, app_id, app_id_size);
-
- //if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (place_apps,
&app_id_hash, app_id_value,
- //
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
- //{
- // GNUNET_break (0);
- //}
-
return GNUNET_OK;
}
@@ -1317,18 +1271,6 @@ app_place_remove (const char *app_id,
if (NULL != app_places)
GNUNET_CONTAINER_multihashmap_remove (app_places, &place_pub_hash, NULL);
- //struct GNUNET_CONTAINER_MultiHashMap *
- // place_apps = GNUNET_CONTAINER_multihashmap_get (places_apps,
&place_pub_hash);
- //if (NULL != place_apps)
- //{
- // void *app_id_value = GNUNET_CONTAINER_multihashmap_get (place_apps,
&app_id_hash);
- // if (NULL != app_id_value)
- // {
- // GNUNET_CONTAINER_multihashmap_remove (place_apps, &app_id_hash,
app_id_value);
- // GNUNET_free (app_id_value);
- // }
- //}
-
int ret = GNUNET_OK;
if (0 != unlink (app_place_filename))
@@ -1424,100 +1366,104 @@ void
app_notify_place (const struct GNUNET_MessageHeader *msg,
struct GNUNET_SERVICE_Client *client)
{
+ struct AppPlaceMessage *amsg;
+ struct GNUNET_MQ_Envelope *env;
+ uint16_t msg_size = ntohs (msg->size);
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Sending place notification of type %u to client.\n",
client, ntohs (msg->type));
-
- uint16_t msg_size = ntohs (msg->size);
- struct AppPlaceMessage amsg;
- amsg.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE);
- amsg.header.size = htons (sizeof (amsg));
- // FIXME: also notify about not entered places
- amsg.place_state = GNUNET_SOCIAL_PLACE_STATE_ENTERED;
-
switch (ntohs (msg->type))
{
case GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER:
+ {
+ struct HostEnterRequest *hreq = (struct HostEnterRequest *) msg;
if (msg_size < sizeof (struct HostEnterRequest))
return;
- struct HostEnterRequest *hreq = (struct HostEnterRequest *) msg;
- amsg.is_host = GNUNET_YES;
- amsg.ego_pub_key = hreq->ego_pub_key;
- amsg.place_pub_key = hreq->place_pub_key;
+ env = GNUNET_MQ_msg (amsg,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE);
+ // FIXME: also notify about not entered places
+ amsg->place_state = GNUNET_SOCIAL_PLACE_STATE_ENTERED;
+ amsg->is_host = GNUNET_YES;
+ amsg->ego_pub_key = hreq->ego_pub_key;
+ amsg->place_pub_key = hreq->place_pub_key;
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
break;
-
+ }
case GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER:
+ {
if (msg_size < sizeof (struct GuestEnterRequest))
return;
struct GuestEnterRequest *greq = (struct GuestEnterRequest *) msg;
- amsg.is_host = GNUNET_NO;
- amsg.ego_pub_key = greq->ego_pub_key;
- amsg.place_pub_key = greq->place_pub_key;
+ env = GNUNET_MQ_msg (amsg,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE);
+ // FIXME: also notify about not entered places
+ amsg->place_state = GNUNET_SOCIAL_PLACE_STATE_ENTERED;
+ amsg->is_host = GNUNET_NO;
+ amsg->ego_pub_key = greq->ego_pub_key;
+ amsg->place_pub_key = greq->place_pub_key;
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
break;
-
+ }
default:
return;
}
-
- client_send_msg (client, &amsg.header);
}
void
app_notify_place_end (struct GNUNET_SERVICE_Client *client)
{
+ struct GNUNET_MQ_Envelope *env;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Sending end of place list notification to client\n",
client);
-
- struct GNUNET_MessageHeader msg;
- msg.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END);
- msg.size = htons (sizeof (msg));
-
- client_send_msg (client, &msg);
+ env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SOCIAL_APP_PLACE_END);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
void
app_notify_ego (struct Ego *ego, struct GNUNET_SERVICE_Client *client)
{
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "%p Sending ego notification to client: %s\n",
- client, ego->name);
-
+ struct AppEgoMessage *emsg;
+ struct GNUNET_MQ_Envelope *env;
size_t name_size = strlen (ego->name) + 1;
- struct AppEgoMessage *emsg = GNUNET_malloc (sizeof (*emsg) + name_size);
- emsg->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO);
- emsg->header.size = htons (sizeof (*emsg) + name_size);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "%p Sending ego notification to client: %s\n",
+ client, ego->name);
+ env = GNUNET_MQ_msg_extra (emsg,
+ name_size,
+ GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO);
GNUNET_CRYPTO_ecdsa_key_get_public (&ego->key, &emsg->ego_pub_key);
GNUNET_memcpy (&emsg[1], ego->name, name_size);
-
- client_send_msg (client, &emsg->header);
- GNUNET_free (emsg);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
void
app_notify_ego_end (struct GNUNET_SERVICE_Client *client)
{
+ struct GNUNET_MQ_Envelope *env;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Sending end of ego list notification to client\n",
client);
-
- struct GNUNET_MessageHeader msg;
- msg.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END);
- msg.size = htons (sizeof (msg));
-
- client_send_msg (client, &msg);
+ env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SOCIAL_APP_EGO_END);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
int
app_place_entry_notify (void *cls, const struct GNUNET_HashCode *key, void
*value)
{
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "app_place_entry_notify\n");
struct GNUNET_MessageHeader *
msg = GNUNET_CONTAINER_multihashmap_get (places, key);
if (NULL != msg)
@@ -1647,13 +1593,9 @@ handle_client_host_enter (void *cls,
{
struct Client *c = cls;
struct GNUNET_SERVICE_Client *client = c->client;
-
struct HostEnterRequest *
hreq = (struct HostEnterRequest *) GNUNET_copy_message (&hr->header);
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "handle_client_host_enter\n");
-
uint8_t app_id_size = ntohs (hreq->header.size) - sizeof (*hreq);
const char *app_id = NULL;
uint16_t offset = GNUNET_STRINGS_buffer_tokenize ((const char *) &hreq[1],
@@ -1708,7 +1650,7 @@ handle_client_host_enter (void *cls,
if (ret != GNUNET_SYSERR)
{
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Client connected as host to place %s.\n",
hst, GNUNET_h2s (&plc->pub_key_hash));
@@ -1754,8 +1696,6 @@ guest_enter (const struct GuestEnterRequest *greq, struct
Guest **ret_gst)
if (NULL == ego)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "NULL == ego\n");
return GNUNET_SYSERR;
}
@@ -1770,10 +1710,6 @@ guest_enter (const struct GuestEnterRequest *greq,
struct Guest **ret_gst)
if (NULL != plc_gst)
gst = GNUNET_CONTAINER_multihashmap_get (plc_gst, &ego_pub_hash);
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "guest enter, gst = %p\n",
- gst);
-
if (NULL == gst || NULL == gst->slave)
{
gst = GNUNET_new (struct Guest);
@@ -1811,9 +1747,6 @@ guest_enter (const struct GuestEnterRequest *greq, struct
Guest **ret_gst)
struct GNUNET_PSYC_Message *join_msg = NULL;
uint16_t join_msg_size = 0;
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "guest_enter 2\n");
-
if (sizeof (struct GNUNET_MessageHeader) <= remaining)
{
join_msg = (struct GNUNET_PSYC_Message *) p;
@@ -1853,15 +1786,10 @@ guest_enter (const struct GuestEnterRequest *greq,
struct Guest **ret_gst)
(void) GNUNET_CONTAINER_multihashmap_put (place_guests,
&plc->pub_key_hash, plc_gst,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
}
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "Adding guest %p\n",
- gst);
(void) GNUNET_CONTAINER_multihashmap_put (plc_gst, &plc->ego_pub_hash, gst,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
(void) GNUNET_CONTAINER_multihashmap_put (guests, &plc->pub_key_hash, gst,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "GNUNET_PSYC_slave_join\n");
gst->slave
= GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &plc->ego_key,
gst->join_flags, &gst->origin,
@@ -1884,23 +1812,20 @@ static int
client_guest_enter (struct Client *c,
const struct GuestEnterRequest *greq)
{
+ struct GNUNET_PSYC_CountersResultMessage *result_msg;
+ struct GNUNET_MQ_Envelope *env;
struct GNUNET_SERVICE_Client *client = c->client;
-
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "handle_client_guest_enter\n");
-
uint16_t remaining = ntohs (greq->header.size) - sizeof (*greq);
const char *app_id = NULL;
uint16_t offset = GNUNET_STRINGS_buffer_tokenize ((const char *) &greq[1],
remaining, 1, &app_id);
+ struct Guest *gst = NULL;
+ struct Place *plc = NULL;
+
if (0 == offset)
{
return GNUNET_SYSERR;
}
-
- struct Guest *gst = NULL;
- struct Place *plc = NULL;
-
switch (guest_enter (greq, &gst))
{
case GNUNET_YES:
@@ -1914,17 +1839,18 @@ client_guest_enter (struct Client *c,
{
plc = c->place = &gst->place;
plc->guest = gst;
-
- struct GNUNET_PSYC_CountersResultMessage res;
- res.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK);
- res.header.size = htons (sizeof (res));
- res.result_code = htonl (GNUNET_OK);
- res.max_message_id = GNUNET_htonll (plc->max_message_id);
-
- client_send_msg (client, &res.header);
+ env = GNUNET_MQ_msg (result_msg,
+ GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK);
+ result_msg->result_code = htonl (GNUNET_OK);
+ result_msg->max_message_id = GNUNET_htonll (plc->max_message_id);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
if (NULL != gst->join_dcsn)
- client_send_msg (client, &gst->join_dcsn->header);
-
+ {
+ env = GNUNET_MQ_msg_copy (&gst->join_dcsn->header);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
+ }
break;
}
case GNUNET_SYSERR:
@@ -1957,8 +1883,6 @@ static void
handle_client_guest_enter (void *cls,
const struct GuestEnterRequest *greq)
{
- // FIXME: this must not be called directly by gns_result_guest_enter because
then
- // GNUNET_SERVICE_client_continue is called twice
struct Client *c = cls;
if (GNUNET_SYSERR == client_guest_enter (c, greq))
@@ -1992,7 +1916,7 @@ gns_result_guest_enter (void *cls, uint32_t rd_count,
{
struct GuestEnterByNameClosure *gcls = cls;
struct Client *c = gcls->client;
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p GNS result: %u records.\n",
c, rd_count);
@@ -2158,8 +2082,6 @@ handle_client_app_connect (void *cls,
struct GNUNET_HashCode app_id_hash;
GNUNET_CRYPTO_hash (app_id, app_id_size, &app_id_hash);
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "iterating egos\n");
GNUNET_CONTAINER_multihashmap_iterate (egos, ego_entry, client);
app_notify_ego_end (client);
@@ -2207,16 +2129,6 @@ handle_client_app_detach (void *cls,
}
-static int
-app_places_entry_remove (void *cls, const struct GNUNET_HashCode *key, void
*value)
-{
- struct Place *plc = cls;
- const char *app_id = value;
- app_place_remove (app_id, &plc->ego_pub_key, &plc->pub_key);
- return GNUNET_YES;
-}
-
-
/**
* Handle application leave request.
*/
@@ -2228,10 +2140,6 @@ handle_client_place_leave (void *cls,
struct GNUNET_SERVICE_Client *client = c->client;
struct Place *plc = c->place;
struct GNUNET_MQ_Envelope *env;
- struct GNUNET_MessageHeader *ack_msg;
-
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "handle_client_place_leave\n");
if (NULL == plc)
{
@@ -2240,25 +2148,11 @@ handle_client_place_leave (void *cls,
return;
}
- /* FIXME: remove all app subscriptions and leave this place */
-
- //struct GNUNET_CONTAINER_MultiHashMap *
- // place_apps = GNUNET_CONTAINER_multihashmap_get (places_apps,
&plc->pub_key_hash);
- //if (NULL != place_apps)
- //{
- // GNUNET_CONTAINER_multihashmap_iterate (place_apps,
app_places_entry_remove, plc);
- //}
-
- /* FIXME: disconnect from the network, but keep local connection for history
access */
-
- /* Disconnect all clients connected to the place */
-
for (struct ClientListItem *cli = plc->clients_head;
NULL != cli;
cli = cli->next)
{
- env = GNUNET_MQ_msg (ack_msg,
- GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE_ACK);
+ env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE_ACK);
GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (cli->client),
env);
}
@@ -2276,7 +2170,6 @@ handle_client_place_leave (void *cls,
c->place = NULL;
}
}
- // FIXME: can't continue+drop above, but should not drop above!
GNUNET_SERVICE_client_continue (client);
}
@@ -2365,10 +2258,15 @@ handle_client_join_decision (void *cls,
static void
send_message_ack (struct Place *plc, struct GNUNET_SERVICE_Client *client)
{
- struct GNUNET_MessageHeader res;
- res.size = htons (sizeof (res));
- res.type = htons (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK);
- client_send_msg (client, &res);
+ struct GNUNET_MQ_Envelope *env;
+
+ env = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_ACK);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "sending psyc message ack to client %p, mq = %p\n",
+ client,
+ GNUNET_SERVICE_client_get_mq (client));
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
}
@@ -2925,26 +2823,26 @@ psyc_transmit_queue_message (struct Place *plc,
}
-/**
- * Cancel transmission of current message to PSYC.
- *
- * @param plc Place to send to.
- * @param client Client the message originates from.
- */
-static void
-psyc_transmit_cancel (struct Place *plc, struct GNUNET_SERVICE_Client *client)
-{
- uint16_t type = GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL;
-
- struct GNUNET_MessageHeader msg;
- msg.size = htons (sizeof (msg));
- msg.type = htons (type);
-
- psyc_transmit_queue_message (plc, client, sizeof (msg), &msg, type, type,
NULL);
- psyc_transmit_message (plc);
-
- /* FIXME: cleanup */
-}
+///**
+// * Cancel transmission of current message to PSYC.
+// *
+// * @param plc Place to send to.
+// * @param client Client the message originates from.
+// */
+//static void
+//psyc_transmit_cancel (struct Place *plc, struct GNUNET_SERVICE_Client
*client)
+//{
+// uint16_t type = GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL;
+//
+// struct GNUNET_MessageHeader msg;
+// msg.size = htons (sizeof (msg));
+// msg.type = htons (type);
+//
+// psyc_transmit_queue_message (plc, client, sizeof (msg), &msg, type, type,
NULL);
+// psyc_transmit_message (plc);
+//
+// /* FIXME: cleanup */
+//}
static int
@@ -3033,13 +2931,10 @@ handle_client_psyc_message (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"%p Received invalid message part from client.\n", plc);
GNUNET_break (0);
- ret = GNUNET_SYSERR;
- }
-
- if (GNUNET_OK == ret)
- GNUNET_SERVICE_client_continue (client);
- else
GNUNET_SERVICE_client_drop (client);
+ return;
+ }
+ GNUNET_SERVICE_client_continue (client);
}
@@ -3069,7 +2964,7 @@ psyc_recv_history_message (void *cls, const struct
GNUNET_PSYC_MessageHeader *ms
GNUNET_memcpy (&res[1], msg, size);
/** @todo FIXME: send only to requesting client */
- place_send_msg (plc, &res->header);
+ place_send_msg (plc, GNUNET_MQ_msg_copy (&res->header));
GNUNET_free (res);
}
@@ -3171,29 +3066,24 @@ psyc_recv_state_var (void *cls,
uint32_t value_size,
uint32_t full_value_size)
{
+ struct GNUNET_OperationResultMessage *result_msg;
+ struct GNUNET_MQ_Envelope *env;
struct OperationClosure *opcls = cls;
struct Client *c = opcls->client;
struct Place *plc = c->place;
+ uint16_t size = ntohs (mod->size);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p Received state variable %s from PSYC\n",
plc, name);
-
- uint16_t size = ntohs (mod->size);
-
- struct GNUNET_OperationResultMessage *
- res = GNUNET_malloc (sizeof (*res) + size);
- res->header.size = htons (sizeof (*res) + size);
- res->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT);
- res->op_id = opcls->op_id;
- res->result_code = GNUNET_htonll (GNUNET_OK);
-
- GNUNET_memcpy (&res[1], mod, size);
-
+ env = GNUNET_MQ_msg_extra (result_msg,
+ size,
+ GNUNET_MESSAGE_TYPE_PSYC_STATE_RESULT);
+ result_msg->op_id = opcls->op_id;
+ result_msg->result_code = GNUNET_htonll (GNUNET_OK);
+ GNUNET_memcpy (&result_msg[1], mod, size);
/** @todo FIXME: send only to requesting client */
- place_send_msg (plc, &res->header);
-
- GNUNET_free (res);
+ place_send_msg (plc, env);
}
@@ -3247,7 +3137,7 @@ handle_client_state_get (void *cls,
uint16_t size = ntohs (req->header.size);
const char *name = (const char *) &req[1];
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%p State get #%" PRIu64 ": %s\n",
plc, GNUNET_ntohll (req->op_id), name);
@@ -3300,8 +3190,6 @@ namestore_recv_records_store_result (void *cls, int32_t
result,
struct OperationClosure *opcls = cls;
struct Client *c = opcls->client;
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
- "namestore_recv_records_store_result\n");
// FIXME: client might have been disconnected
client_send_result (c->client, opcls->op_id, result, err_msg,
(NULL != err_msg) ? strlen (err_msg) : 0);
@@ -3591,7 +3479,7 @@ identity_recv_ego (void *cls, struct GNUNET_IDENTITY_Ego
*id_ego,
if (NULL == id_ego) // end of initial list of egos
return;
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"social service received ego %s\n",
name);
@@ -3643,7 +3531,7 @@ run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *c,
struct GNUNET_SERVICE_Handle *svc)
{
- GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"starting social service\n");
cfg = c;
diff --git a/src/social/social_api.c b/src/social/social_api.c
index 87b46821e..73587598b 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -399,11 +399,6 @@ place_cleanup (struct GNUNET_SOCIAL_Place *plc)
struct GNUNET_HashCode place_pub_hash;
GNUNET_CRYPTO_hash (&plc->pub_key, sizeof (plc->pub_key), &place_pub_hash);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "%s place cleanup: %s\n",
- GNUNET_YES == plc->is_host ? "host" : "guest",
- GNUNET_h2s (&place_pub_hash));
-
if (NULL != plc->tmit)
{
GNUNET_PSYC_transmit_destroy (plc->tmit);
@@ -416,8 +411,6 @@ place_cleanup (struct GNUNET_SOCIAL_Place *plc)
}
if (NULL != plc->mq)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "destroying MQ (place_cleanup)\n");
GNUNET_MQ_destroy (plc->mq);
plc->mq = NULL;
}
@@ -441,9 +434,6 @@ place_disconnect (struct GNUNET_SOCIAL_Place *plc)
GNUNET_CRYPTO_hash (&plc->pub_key,
sizeof (plc->pub_key),
&place_pub_hash);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "place_disconnect, plc = %s\n",
- GNUNET_h2s (&place_pub_hash));
place_cleanup (plc);
}
@@ -505,7 +495,7 @@ host_recv_notice_place_leave_method (void *cls,
struct GNUNET_SOCIAL_Nym *nym = nym_get_or_create (&msg->slave_pub_key);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Host received method for message ID %" PRIu64 " from nym %s:
%s\n",
message_id, GNUNET_h2s (&nym->pub_key_hash), method_name);
@@ -513,7 +503,7 @@ host_recv_notice_place_leave_method (void *cls,
hst->notice_place_leave_env = GNUNET_PSYC_env_create ();
char *str = GNUNET_CRYPTO_ecdsa_public_key_to_string
(&hst->notice_place_leave_nym->pub_key);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"_notice_place_leave: got method from nym %s (%s).\n",
GNUNET_h2s (&hst->notice_place_leave_nym->pub_key_hash), str);
GNUNET_free (str);
@@ -535,7 +525,7 @@ host_recv_notice_place_leave_modifier (void *cls,
if (NULL == hst->notice_place_leave_env)
return;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Host received modifier for _notice_place_leave message with ID
%" PRIu64 ":\n"
"%c%s: %.*s\n",
message_id, oper, name, value_size, (const char *) value);
@@ -562,7 +552,7 @@ host_recv_notice_place_leave_eom (void *cls,
return;
char *str = GNUNET_CRYPTO_ecdsa_public_key_to_string
(&hst->notice_place_leave_nym->pub_key);
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"_notice_place_leave: got EOM from nym %s (%s).\n",
GNUNET_h2s (&hst->notice_place_leave_nym->pub_key_hash), str);
GNUNET_free (str);
@@ -895,9 +885,6 @@ handle_host_enter_request (void *cls,
{
struct GNUNET_SOCIAL_Host *hst = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "handle_host_enter_request\n");
-
if (NULL == hst->answer_door_cb)
return;
@@ -1108,7 +1095,7 @@ handle_place_leave_ack (void *cls,
{
struct GNUNET_SOCIAL_Place *plc = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"%s left place %p\n",
plc->is_host ? "host" : "guest",
plc);
@@ -1151,8 +1138,6 @@ host_disconnected (void *cls, enum GNUNET_MQ_Error error)
}
if (NULL != plc->mq)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "destroying MQ (host_disconnected)\n");
GNUNET_MQ_destroy (plc->mq);
plc->mq = NULL;
}
@@ -1624,8 +1609,6 @@ GNUNET_SOCIAL_host_leave (struct GNUNET_SOCIAL_Host *hst,
struct GNUNET_MessageHeader *msg;
struct GNUNET_MQ_Envelope *envelope;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "GNUNET_SOCIAL_host_leave\n");
GNUNET_SOCIAL_host_announce (hst, "_notice_place_closing", env, NULL, NULL,
GNUNET_SOCIAL_ANNOUNCE_NONE);
hst->plc.disconnect_cb = disconnect_cb;
@@ -1672,8 +1655,6 @@ guest_disconnected (void *cls, enum GNUNET_MQ_Error error)
}
if (NULL != plc->mq)
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "destroying MQ (guest_disconnected)\n");
GNUNET_MQ_destroy (plc->mq);
plc->mq = NULL;
}
@@ -2059,9 +2040,6 @@ GNUNET_SOCIAL_guest_disconnect (struct
GNUNET_SOCIAL_Guest *gst,
{
struct GNUNET_SOCIAL_Place *plc = &gst->plc;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "GNUNET_SOCIAL_guest_disconnect, gst = %p\n",
- gst);
plc->disconnect_cb = disconnect_cb;
plc->disconnect_cls = cls;
place_disconnect (plc);
@@ -2095,10 +2073,6 @@ GNUNET_SOCIAL_guest_leave (struct GNUNET_SOCIAL_Guest
*gst,
GNUNET_SOCIAL_guest_talk (gst, "_notice_place_leave", env, NULL, NULL,
GNUNET_SOCIAL_TALK_NONE);
-
-
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "social_api: place_leave\n");
gst->plc.disconnect_cb = disconnect_cb;
gst->plc.disconnect_cls = cls;
envelope = GNUNET_MQ_msg (msg,
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 22/64: protocol change: add ack message for guests/hosts leaving a place, (continued)
- [GNUnet-SVN] [gnunet] 22/64: protocol change: add ack message for guests/hosts leaving a place, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 44/64: tried to print out stacktrace, not working. removed., gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 50/64: remove debug assertion; add debug output, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 59/64: master/slave pointers must not be NULL immediatly after sending leave request, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 58/64: fixing the place leave logic after protocol change, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 55/64: test_psyc: less services and less noise in the output, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 60/64: actually test reconnecting; result in enter callback must always be GNUNET_OK, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 56/64: result is a boolean; stylistic changes, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 52/64: stylistic fix, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 61/64: consider entry decision while re-entering a place, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 27/64: Use MQ API instead of manually allocating messages; simplify logic in handle_client_psyc_message; cleanup,
gnunet <=
- [GNUnet-SVN] [gnunet] 45/64: actually use the is_disconnecting flag; debug output; remove dead code, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 46/64: don't shutdown before all members and origin have disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 38/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 48/64: we have to destroy channels to the origin when cleaning up a member, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 41/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 51/64: be more clear about test procedure (use self-explanatory function names), gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 57/64: test_social runs into the case GNUNET_YES == grp->is_disconnected, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 49/64: forgot to call GNUNET_SERVICE_client_continue, gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social', gnunet, 2017/12/30
- [GNUnet-SVN] [gnunet] 28/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social, gnunet, 2017/12/30