X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fsocial%2Fgnunet-service-social.c;h=e6ee24a4fd5dbc2b5ef462b969590b5ea1b6f892;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=48621ad8317652ff51b94f959fa6452fc4221ad7;hpb=f27338992f0a5915ee974faea05f764c2df6f584;p=oweals%2Fgnunet.git diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c index 48621ad83..e6ee24a4f 100644 --- a/src/social/gnunet-service-social.c +++ b/src/social/gnunet-service-social.c @@ -1,6 +1,6 @@ /* * This file is part of GNUnet - * Copyright (C) 2013 Christian Grothoff (and other contributing authors) + * Copyright (C) 2013 GNUnet e.V. * * GNUnet is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -25,11 +25,15 @@ */ #include +#include #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_constants.h" #include "gnunet_protocols.h" +#include "gnunet_identity_service.h" +#include "gnunet_namestore_service.h" +#include "gnunet_gns_service.h" #include "gnunet_statistics_service.h" #include "gnunet_psyc_service.h" #include "gnunet_psyc_util_lib.h" @@ -43,33 +47,87 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Handle to the statistics service. + * Service handle. */ +static struct GNUNET_SERVICE_Handle *service; + +/* Handles to other services */ +static struct GNUNET_IDENTITY_Handle *id; +static struct GNUNET_GNS_Handle *gns; +static struct GNUNET_NAMESTORE_Handle *namestore; static struct GNUNET_STATISTICS_Handle *stats; /** - * Notification context, simplifies client broadcasts. + * ID of this peer. */ -static struct GNUNET_SERVER_NotificationContext *nc; +static struct GNUNET_PeerIdentity this_peer; /** * All connected hosts. - * Place's pub_key_hash -> struct Host + * H(place_pub_key) -> struct Host */ static struct GNUNET_CONTAINER_MultiHashMap *hosts; /** * All connected guests. - * Place's pub_key_hash -> struct Guest + * H(place_pub_key) -> struct Guest */ static struct GNUNET_CONTAINER_MultiHashMap *guests; /** * Connected guests per place. - * Place's pub_key_hash -> Guest's pub_key -> struct Guest + * H(place_pub_key) -> ego_pub_key -> struct Guest */ static struct GNUNET_CONTAINER_MultiHashMap *place_guests; +/** + * Places entered as host or guest. + * H(place_pub_key) -> struct HostEnterRequest OR struct GuestEnterRequest + */ +static struct GNUNET_CONTAINER_MultiHashMap *places; + +/** + * Places entered per application. + * H(app_id) -> H(place_pub_key) -> NULL + */ +static struct GNUNET_CONTAINER_MultiHashMap *apps_places; + +/** + * Application subscriptions per place. + * H(place_pub_key) -> H(app_id) + */ +static struct GNUNET_CONTAINER_MultiHashMap *places_apps; + +/** + * Connected applications. + * H(app_id) -> struct Application + */ +static struct GNUNET_CONTAINER_MultiHashMap *apps; + +/** + * All egos. + * H(ego_pub_key) -> struct Ego + */ +static struct GNUNET_CONTAINER_MultiHashMap *egos; + +/** + * Directory for storing social data. + * Default: $GNUNET_DATA_HOME/social + */ +static char *dir_social; + +/** + * Directory for storing place data. + * $dir_social/places + */ +static char *dir_places; + +/** + * Directory for storing app data. + * $dir_social/apps + */ +static char *dir_apps; + /** * Message fragment transmission queue. @@ -79,7 +137,7 @@ struct FragmentTransmitQueue struct FragmentTransmitQueue *prev; struct FragmentTransmitQueue *next; - struct GNUNET_SERVER_Client *client; + struct GNUNET_SERVICE_Client *client; /** * Pointer to the next message part inside the data after this struct. @@ -111,7 +169,7 @@ struct MessageTransmitQueue struct FragmentTransmitQueue *frags_head; struct FragmentTransmitQueue *frags_tail; - struct GNUNET_SERVER_Client *client; + struct GNUNET_SERVICE_Client *client; }; /** @@ -122,7 +180,7 @@ struct ClientListItem struct ClientListItem *prev; struct ClientListItem *next; - struct GNUNET_SERVER_Client *client; + struct GNUNET_SERVICE_Client *client; }; @@ -140,7 +198,12 @@ struct Place struct GNUNET_PSYC_Channel *channel; /** - * Public key of the channel. + * Private key of home in case of a host. + */ + struct GNUNET_CRYPTO_EddsaPublicKey key; + + /** + * Public key of place. */ struct GNUNET_CRYPTO_EddsaPublicKey pub_key; @@ -149,6 +212,26 @@ struct Place */ struct GNUNET_HashCode pub_key_hash; + /** + * Private key of ego. + */ + struct GNUNET_CRYPTO_EcdsaPrivateKey ego_key; + + /** + * Public key of ego. + */ + struct GNUNET_CRYPTO_EcdsaPublicKey ego_pub_key; + + /** + * Hash of @a ego_pub_key. + */ + struct GNUNET_HashCode ego_pub_hash; + + /** + * Slicer for processing incoming messages. + */ + struct GNUNET_PSYC_Slicer *slicer; + /** * Last message ID received for the place. * 0 if there is no such message. @@ -156,9 +239,14 @@ struct Place uint64_t max_message_id; /** - * Is this a host (#GNUNET_YES), or guest (#GNUNET_NO)? + * Offset where the file is currently being written. */ - uint8_t is_host; + uint64_t file_offset; + + /** + * Whether or not to save the file (#GNUNET_YES or #GNUNET_NO) + */ + uint8_t file_save; /** * Is this place ready to receive messages from client? @@ -171,6 +259,16 @@ struct Place * #GNUNET_YES or #GNUNET_NO */ uint8_t is_disconnected; + + /** + * Is this a host (#GNUNET_YES), or guest (#GNUNET_NO)? + */ + uint8_t is_host; + + union { + struct Host *host; + struct Guest *guest; + }; }; @@ -182,12 +280,7 @@ struct Host /** * Place struct common for Host and Guest */ - struct Place plc; - - /** - * Private key of the channel. - */ - struct GNUNET_CRYPTO_EddsaPrivateKey priv_key; + struct Place place; /** * Handle for the multicast origin. @@ -205,6 +298,11 @@ struct Host */ struct GNUNET_CONTAINER_MultiHashMap *join_reqs; + /** + * Messages being relayed. + */ + struct GNUNET_CONTAINER_MultiHashMap *relay_msgs; + /** * @see enum GNUNET_PSYC_Policy */ @@ -220,22 +318,7 @@ struct Guest /** * Place struct common for Host and Guest. */ - struct Place plc; - - /** - * Private key of the slave. - */ - struct GNUNET_CRYPTO_EcdsaPrivateKey priv_key; - - /** - * Public key of the slave. - */ - struct GNUNET_CRYPTO_EcdsaPublicKey pub_key; - - /** - * Hash of @a pub_key. - */ - struct GNUNET_HashCode pub_key_hash; + struct Place place; /** * Handle for the PSYC slave. @@ -272,28 +355,57 @@ struct Guest */ struct GNUNET_PSYC_JoinDecisionMessage *join_dcsn; + /** + * Join flags for the PSYC service. + */ + enum GNUNET_PSYC_SlaveJoinFlags join_flags; }; +/** + * Context for a client. + */ struct Client { + /** + * Client handle. + */ + struct GNUNET_SERVICE_Client *client; + /** * Place where the client entered. */ - struct Place *plc; + struct Place *place; /** * Message queue for the message currently being transmitted * by this client. */ struct MessageTransmitQueue *tmit_msg; + + /** + * ID for application clients. + */ + char *app_id; +}; + + +struct Application +{ + struct ClientListItem *clients_head; + struct ClientListItem *clients_tail; +}; + + +struct Ego { + struct GNUNET_CRYPTO_EcdsaPrivateKey key; + char *name; }; struct OperationClosure { - struct GNUNET_SERVER_Client *client; - struct Place *plc; + struct Client *client; uint64_t op_id; uint32_t flags; }; @@ -303,19 +415,61 @@ static int psyc_transmit_message (struct Place *plc); +/** + * Clean up place data structures after a client disconnected. + * + * @param cls the `struct Place` to clean up + */ +static void +cleanup_place (void *cls); + + +static struct MessageTransmitQueue * +psyc_transmit_queue_message (struct Place *plc, + struct GNUNET_SERVICE_Client *client, + size_t data_size, + const void *data, + uint16_t first_ptype, uint16_t last_ptype, + struct MessageTransmitQueue *tmit_msg); + + +static int +place_entry_cleanup (void *cls, + const struct GNUNET_HashCode *key, + void *value) +{ + struct Place *plc = value; + + cleanup_place (plc); + return GNUNET_YES; +} + + /** * Task run during shutdown. * * @param cls unused - * @param tc unused */ static void -shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +shutdown_task (void *cls) { - if (NULL != nc) + GNUNET_CONTAINER_multihashmap_iterate (hosts, place_entry_cleanup, NULL); + GNUNET_CONTAINER_multihashmap_iterate (guests, place_entry_cleanup, NULL); + + if (NULL != id) + { + GNUNET_IDENTITY_disconnect (id); + id = NULL; + } + if (NULL != namestore) + { + GNUNET_NAMESTORE_disconnect (namestore); + namestore = NULL; + } + if (NULL != gns) { - GNUNET_SERVER_notification_context_destroy (nc); - nc = NULL; + GNUNET_GNS_disconnect (gns); + gns = NULL; } if (NULL != stats) { @@ -331,11 +485,12 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) static void cleanup_host (struct Host *hst) { - struct Place *plc = &hst->plc; + struct Place *plc = &hst->place; if (NULL != hst->master) GNUNET_PSYC_master_stop (hst->master, GNUNET_NO, NULL, NULL); // FIXME GNUNET_CONTAINER_multihashmap_destroy (hst->join_reqs); + GNUNET_CONTAINER_multihashmap_destroy (hst->relay_msgs); GNUNET_CONTAINER_multihashmap_remove (hosts, &plc->pub_key_hash, plc); } @@ -346,12 +501,12 @@ cleanup_host (struct Host *hst) static void cleanup_guest (struct Guest *gst) { - struct Place *plc = &gst->plc; + struct Place *plc = &gst->place; struct GNUNET_CONTAINER_MultiHashMap * plc_gst = GNUNET_CONTAINER_multihashmap_get (place_guests, - &plc->pub_key_hash); - GNUNET_assert (NULL != plc_gst); - GNUNET_CONTAINER_multihashmap_remove (plc_gst, &gst->pub_key_hash, gst); + &plc->pub_key_hash); + GNUNET_assert (NULL != plc_gst); // FIXME + GNUNET_CONTAINER_multihashmap_remove (plc_gst, &plc->ego_pub_hash, gst); if (0 == GNUNET_CONTAINER_multihashmap_size (plc_gst)) { @@ -373,10 +528,14 @@ cleanup_guest (struct Guest *gst) /** * Clean up place data structures after a client disconnected. + * + * @param cls the `struct Place` to clean up */ static void -cleanup_place (struct Place *plc) +cleanup_place (void *cls) { + struct Place *plc = cls; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Cleaning up place %s\n", plc, GNUNET_h2s (&plc->pub_key_hash)); @@ -384,14 +543,9 @@ cleanup_place (struct Place *plc) (GNUNET_YES == plc->is_host) ? cleanup_host ((struct Host *) plc) : cleanup_guest ((struct Guest *) plc); - GNUNET_free (plc); -} - -static void -schedule_cleanup_place (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - cleanup_place (cls); + GNUNET_PSYC_slicer_destroy (plc->slicer); + GNUNET_free (plc); } @@ -399,26 +553,26 @@ schedule_cleanup_place (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc * Called whenever a client is disconnected. * Frees our resources associated with that client. * - * @param cls Closure. - * @param client Identification of the client. + * @param cls closure + * @param client identification of the client + * @param app_ctx must match @a client */ static void -client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) +client_notify_disconnect (void *cls, + struct GNUNET_SERVICE_Client *client, + void *app_ctx) { - if (NULL == client) - return; + struct Client *c = app_ctx; + struct Place *plc = c->place; - struct Client * - ctx = GNUNET_SERVER_client_get_user_context (client, struct Client); - if (NULL == ctx) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "%p User context is NULL in client_disconnect()\n", ctx); - GNUNET_break (0); - return; - } + if (NULL != c->app_id) + GNUNET_free (c->app_id); + + GNUNET_free (c); + + if (NULL == plc) + return; // application client, nothing to do - struct Place *plc = ctx->plc; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Client (%s) disconnected from place %s\n", plc, (GNUNET_YES == plc->is_host) ? "host" : "guest", @@ -435,40 +589,60 @@ client_disconnect (void *cls, struct GNUNET_SERVER_Client *client) } cli = cli->next; } +} - if (NULL == plc->clients_head) - { /* Last client disconnected. */ - if (GNUNET_YES != plc->is_disconnected) - { - plc->is_disconnected = GNUNET_YES; - if (NULL != plc->tmit_msgs_head) - { /* Send pending messages to PSYC before cleanup. */ - psyc_transmit_message (plc); - } - else - { - cleanup_place (plc); - } - } - } + +/** + * A new client connected. + * + * @param cls NULL + * @param client client to add + * @param mq message queue for @a client + * @return @a client + */ +static void * +client_notify_connect (void *cls, + struct GNUNET_SERVICE_Client *client, + struct GNUNET_MQ_Handle *mq) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client connected: %p\n", client); + + struct Client *c = GNUNET_malloc (sizeof (*c)); + c->client = client; + + return c; +} + + +/** + * 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 the channel. + * Send message to all clients connected to a place. */ static void -client_send_msg (const struct Place *plc, +place_send_msg (const struct Place *plc, const struct GNUNET_MessageHeader *msg) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "%p Sending message to clients.\n", plc); + "%p Sending message to clients of place.\n", plc); struct ClientListItem *cli = plc->clients_head; while (NULL != cli) { - GNUNET_SERVER_notification_context_add (nc, cli->client); - GNUNET_SERVER_notification_context_unicast (nc, cli->client, msg, GNUNET_NO); + client_send_msg (cli->client, msg); cli = cli->next; } } @@ -489,7 +663,7 @@ client_send_msg (const struct Place *plc, * Size of @a data. */ static void -client_send_result (struct GNUNET_SERVER_Client *client, uint64_t op_id, +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_OperationResultMessage *res; @@ -497,23 +671,41 @@ client_send_result (struct GNUNET_SERVER_Client *client, uint64_t op_id, 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); - res->result_code = GNUNET_htonll_signed (result_code); + res->result_code = GNUNET_htonll (result_code); res->op_id = op_id; if (0 < data_size) - memcpy (&res[1], data, 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); - GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_notification_context_unicast (nc, client, &res->header, - GNUNET_NO); + client_send_msg (client, &res->header); GNUNET_free (res); } +static void +client_send_host_enter_ack (struct GNUNET_SERVICE_Client *client, + struct Host *hst, uint32_t result) +{ + 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; + + if (NULL != client) + client_send_msg (client, &hack.header); + else + place_send_msg (plc, &hack.header); +} + + /** * Called after a PSYC master is started. */ @@ -521,17 +713,11 @@ static void psyc_master_started (void *cls, int result, uint64_t max_message_id) { struct Host *hst = cls; - struct Place *plc = &hst->plc; + struct Place *plc = &hst->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_HOST_ENTER_ACK); - res.header.size = htons (sizeof (res)); - res.result_code = htonl (result - INT32_MIN); - res.max_message_id = GNUNET_htonll (plc->max_message_id); - - client_send_msg (plc, &res.header); + client_send_host_enter_ack (NULL, hst, result); } @@ -550,7 +736,7 @@ 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); - client_send_msg (&hst->plc, &req->header); + place_send_msg (&hst->place, &req->header); } @@ -561,17 +747,17 @@ static void psyc_slave_connected (void *cls, int result, uint64_t max_message_id) { struct Guest *gst = cls; - struct Place *plc = &gst->plc; + 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 - INT32_MIN); + res.result_code = htonl (result); res.max_message_id = GNUNET_htonll (plc->max_message_id); - client_send_msg (plc, &res.header); + place_send_msg (plc, &res.header); } @@ -585,7 +771,7 @@ psyc_recv_join_dcsn (void *cls, const struct GNUNET_PSYC_Message *join_msg) { struct Guest *gst = cls; - client_send_msg (&gst->plc, &dcsn->header); + place_send_msg (&gst->place, &dcsn->header); } @@ -594,168 +780,930 @@ psyc_recv_join_dcsn (void *cls, */ static void psyc_recv_message (void *cls, - uint64_t message_id, - uint32_t flags, const struct GNUNET_PSYC_MessageHeader *msg) { struct Place *plc = cls; - client_send_msg (plc, &msg->header); - /* FIXME: further processing */ + char *str = GNUNET_CRYPTO_ecdsa_public_key_to_string (&msg->slave_pub_key); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%p Received PSYC message of size %u from %s.\n", + plc, ntohs (msg->header.size), str); + GNUNET_free (str); + + GNUNET_PSYC_slicer_message (plc->slicer, msg); + + place_send_msg (plc, &msg->header); } /** - * Initialize place data structure. + * Relay a message part received from a guest to the the place. + * + * @param hst + * Host. + * @param pmsg + * Message part. + * @param nym_pub_key + * Nym the message is received from. */ static void -place_init (struct Place *plc) +host_relay_message_part (struct Host *hst, + const struct GNUNET_MessageHeader *pmsg, + const struct GNUNET_CRYPTO_EcdsaPublicKey *nym_pub_key) { + /* separate queue per nym */ + struct GNUNET_HashCode nym_pub_hash; + GNUNET_CRYPTO_hash (nym_pub_key, sizeof (*nym_pub_key), &nym_pub_hash); + + struct MessageTransmitQueue * + tmit_msg = GNUNET_CONTAINER_multihashmap_get (hst->relay_msgs, &nym_pub_hash); + + uint16_t ptype = ntohs (pmsg->type); + + if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD == ptype) + { + /* FIXME: last message was unfinished, cancel & remove from queue */ + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "FIXME: last message was unfinished.\n"); + } + tmit_msg = psyc_transmit_queue_message (&hst->place, NULL, ntohs (pmsg->size), + pmsg, ptype, ptype, tmit_msg); + + switch (ptype) + { + case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_METHOD: + GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_put + (hst->relay_msgs, &nym_pub_hash, tmit_msg, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + break; + case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END: + case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL: + GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_multihashmap_remove + (hst->relay_msgs, &nym_pub_hash, tmit_msg)); + break; + } } /** - * Handle a connecting client entering a place as host. + * Received a method to be relayed from a guest. */ static void -client_recv_host_enter (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *msg) +place_recv_relay_method (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_PSYC_MessageMethod *meth, + uint64_t message_id, + const char *method_name) { - const struct HostEnterRequest *req - = (const struct HostEnterRequest *) msg; + struct Place *plc = cls; - struct GNUNET_CRYPTO_EddsaPublicKey pub_key; - struct GNUNET_HashCode pub_key_hash; + if (GNUNET_PSYC_MESSAGE_REQUEST & ntohs (msg->flags) + && GNUNET_YES == plc->is_host) + { + struct Host *hst = cls; + host_relay_message_part (hst, &meth->header, &msg->slave_pub_key); + } +} - GNUNET_CRYPTO_eddsa_key_get_public (&req->place_key, &pub_key); - GNUNET_CRYPTO_hash (&pub_key, sizeof (pub_key), &pub_key_hash); - struct Host * - hst = GNUNET_CONTAINER_multihashmap_get (hosts, &pub_key_hash); - struct Place *plc; +/** + * Received a modifier to be relayed from a guest. + */ +static void +place_recv_relay_modifier (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg, + uint64_t message_id, + enum GNUNET_PSYC_Operator oper, + const char *name, + const void *value, + uint16_t value_size, + uint16_t full_value_size) +{ + struct Place *plc = cls; - if (NULL == hst) + if (GNUNET_PSYC_MESSAGE_REQUEST & ntohs (msg->flags) + && GNUNET_YES == plc->is_host) { - hst = GNUNET_new (struct Host); - hst->policy = ntohl (req->policy); - hst->priv_key = req->place_key; - hst->join_reqs = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); - - plc = &hst->plc; - plc->is_host = GNUNET_YES; - plc->pub_key = pub_key; - plc->pub_key_hash = pub_key_hash; - place_init (plc); - - GNUNET_CONTAINER_multihashmap_put (hosts, &plc->pub_key_hash, plc, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); - hst->master = GNUNET_PSYC_master_start (cfg, &hst->priv_key, hst->policy, - &psyc_master_started, - &psyc_recv_join_request, - &psyc_recv_message, NULL, hst); - hst->plc.channel = GNUNET_PSYC_master_get_channel (hst->master); + struct Host *hst = cls; + host_relay_message_part (hst, pmsg, &msg->slave_pub_key); } - else - { - plc = &hst->plc; +} - struct GNUNET_PSYC_CountersResultMessage res; - res.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER_ACK); - res.header.size = htons (sizeof (res)); - res.result_code = htonl (GNUNET_OK); - res.max_message_id = GNUNET_htonll (plc->max_message_id); +/** + * Received a data fragment to be relayed from a guest. + */ +static void +place_recv_relay_data (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg, + uint64_t message_id, + const void *data, + uint16_t data_size) +{ + struct Place *plc = cls; - GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_notification_context_unicast (nc, client, &res.header, - GNUNET_NO); + if (GNUNET_PSYC_MESSAGE_REQUEST & ntohs (msg->flags) + && GNUNET_YES == plc->is_host) + { + struct Host *hst = cls; + host_relay_message_part (hst, pmsg, &msg->slave_pub_key); } - - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "%p Client connected as host to place %s.\n", - hst, GNUNET_h2s (&plc->pub_key_hash)); - - struct ClientListItem *cli = GNUNET_new (struct ClientListItem); - cli->client = client; - GNUNET_CONTAINER_DLL_insert (plc->clients_head, plc->clients_tail, cli); - - struct Client *ctx = GNUNET_new (struct Client); - ctx->plc = plc; - GNUNET_SERVER_client_set_user_context (client, ctx); - GNUNET_SERVER_receive_done (client, GNUNET_OK); } /** - * Handle a connecting client entering a place as guest. + * Received end of message to be relayed from a guest. */ static void -client_recv_guest_enter (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *msg) +place_recv_relay_eom (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg, + uint64_t message_id, + uint8_t is_cancelled) { - const struct GuestEnterRequest *req - = (const struct GuestEnterRequest *) msg; - uint16_t req_size = ntohs (req->header.size); - - struct GNUNET_CRYPTO_EcdsaPublicKey gst_pub_key; - struct GNUNET_HashCode pub_key_hash, gst_pub_key_hash; + struct Place *plc = cls; - GNUNET_CRYPTO_ecdsa_key_get_public (&req->guest_key, &gst_pub_key); - GNUNET_CRYPTO_hash (&gst_pub_key, sizeof (gst_pub_key), &gst_pub_key_hash); - GNUNET_CRYPTO_hash (&req->place_key, sizeof (req->place_key), &pub_key_hash); + if (GNUNET_PSYC_MESSAGE_REQUEST & ntohs (msg->flags) + && GNUNET_YES == plc->is_host) + { + struct Host *hst = cls; + host_relay_message_part (hst, pmsg, &msg->slave_pub_key); + } +} - struct GNUNET_CONTAINER_MultiHashMap * - plc_gst = GNUNET_CONTAINER_multihashmap_get (place_guests, &pub_key_hash); - struct Guest *gst = NULL; - struct Place *plc; - if (NULL != plc_gst) +/** + * Received a method to be saved to disk. + * + * Create a new file for writing the data part of the message into, + * if the file does not yet exist. + */ +static void +place_recv_save_method (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_PSYC_MessageMethod *meth, + uint64_t message_id, + const char *method_name) +{ + struct Place *plc = cls; + plc->file_offset = 0; + plc->file_save = GNUNET_NO; + + char *place_pub_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&plc->pub_key); + char *filename = NULL; + GNUNET_asprintf (&filename, "%s%c" "%s%c" "%s%c" "%" PRIu64 ".part", + dir_social, DIR_SEPARATOR, + "files", DIR_SEPARATOR, + place_pub_str, DIR_SEPARATOR, + GNUNET_ntohll (msg->message_id)); + GNUNET_free (place_pub_str); + + /* save if does not already exist */ + if (GNUNET_YES != GNUNET_DISK_file_test (filename)) { - gst = GNUNET_CONTAINER_multihashmap_get (plc_gst, &gst_pub_key_hash); + if (0 == GNUNET_DISK_fn_write (filename, NULL, 0, + GNUNET_DISK_PERM_USER_READ + | GNUNET_DISK_PERM_USER_WRITE)) + { + plc->file_save = GNUNET_YES; + } + else + { + GNUNET_break (0); + } } - if (NULL == gst || NULL == gst->slave) + GNUNET_free (filename); +} + + +/** + * Received a data fragment to be saved to disk. + * + * Append data fragment to the file. + */ +static void +place_recv_save_data (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg, + uint64_t message_id, + const void *data, + uint16_t data_size) +{ + struct Place *plc = cls; + if (GNUNET_YES != plc->file_save) + return; + + char *place_pub_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&plc->pub_key); + char *filename = NULL; + GNUNET_asprintf (&filename, "%s%c" "%s%c" "%s%c" "%" PRIu64 ".part", + dir_social, DIR_SEPARATOR, + "files", DIR_SEPARATOR, + place_pub_str, DIR_SEPARATOR, + GNUNET_ntohll (msg->message_id)); + GNUNET_free (place_pub_str); + if (GNUNET_SYSERR == GNUNET_DISK_directory_create_for_file (filename)) + { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "create", filename); + GNUNET_free (filename); + return; + } + + struct GNUNET_DISK_FileHandle * + fh = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_WRITE, + GNUNET_DISK_PERM_NONE); + if (NULL != fh) + { + if (plc->file_offset != GNUNET_DISK_file_seek + (fh, plc->file_offset, GNUNET_DISK_SEEK_SET)) { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "seek", filename); + GNUNET_DISK_file_close (fh); + GNUNET_free (filename); + return; + } + GNUNET_DISK_file_write (fh, data, data_size); + GNUNET_DISK_file_close (fh); + GNUNET_free (filename); + } + else + { + GNUNET_free (filename); + GNUNET_break (0); + } + plc->file_offset += data_size; +} + + +/** + * Received end of message to be saved to disk. + * + * Remove .part ending from the filename. + */ +static void +place_recv_save_eom (void *cls, + const struct GNUNET_PSYC_MessageHeader *msg, + const struct GNUNET_MessageHeader *pmsg, + uint64_t message_id, + uint8_t is_cancelled) +{ + struct Place *plc = cls; + if (GNUNET_YES != plc->file_save) + return; + + char *place_pub_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&plc->pub_key); + char *fn = NULL; + GNUNET_asprintf (&fn, "%s%c%s%c%s%c%" PRIu64, + dir_social, DIR_SEPARATOR, + "files", DIR_SEPARATOR, + place_pub_str, DIR_SEPARATOR, + GNUNET_ntohll (msg->message_id)); + GNUNET_free (place_pub_str); + char *fn_part = NULL; + GNUNET_asprintf (&fn_part, "%s.part", fn); + + if (rename (fn_part, fn)) { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to rename %s into %s: %s (%d)\n", + fn_part, fn, strerror (errno), errno); + } + + GNUNET_free (fn); + GNUNET_free (fn_part); +} + + +/** + * Initialize place data structure. + */ +static void +place_init (struct Place *plc) +{ + plc->slicer = GNUNET_PSYC_slicer_create (); +} + + +/** + * Add a place to the @e places hash map. + * + * @param ereq + * Entry request. + * + * @return #GNUNET_OK if the place was added + * #GNUNET_NO if the place already exists in the hash map + * #GNUNET_SYSERR on error + */ +static int +place_add (const struct PlaceEnterRequest *ereq) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding place to hashmap:\n"); + + struct EgoPlacePublicKey ego_place_pub_key = { + .ego_pub_key = ereq->ego_pub_key, + .place_pub_key = ereq->place_pub_key, + }; + struct GNUNET_HashCode ego_place_pub_hash; + GNUNET_CRYPTO_hash (&ego_place_pub_key, sizeof (ego_place_pub_key), &ego_place_pub_hash); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " ego_place_pub_hash = %s\n", GNUNET_h2s (&ego_place_pub_hash)); + + struct GNUNET_MessageHeader * + place_msg = GNUNET_CONTAINER_multihashmap_get (places, &ego_place_pub_hash); + if (NULL != place_msg) + return GNUNET_NO; + + place_msg = GNUNET_copy_message (&ereq->header); + if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (places, &ego_place_pub_hash, place_msg, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) + { + GNUNET_break (0); + GNUNET_free (place_msg); + return GNUNET_SYSERR; + } + + return GNUNET_OK; +} + +/** + * Add a place to the @e app_places hash map. + * + * @param app_id + * Application ID. + * @param ereq + * Entry request. + * + * @return #GNUNET_OK if the place was added + * #GNUNET_NO if the place already exists in the hash map + * #GNUNET_SYSERR on error + */ +static int +app_place_add (const char *app_id, + const struct PlaceEnterRequest *ereq) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Adding app place to hashmap:\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " app_id = %s\n", app_id); + + struct GNUNET_HashCode app_id_hash; + GNUNET_CRYPTO_hash (app_id, strlen (app_id) + 1, &app_id_hash); + + struct EgoPlacePublicKey ego_place_pub_key = { + .ego_pub_key = ereq->ego_pub_key, + .place_pub_key = ereq->place_pub_key, + }; + struct GNUNET_HashCode ego_place_pub_hash; + GNUNET_CRYPTO_hash (&ego_place_pub_key, sizeof (ego_place_pub_key), &ego_place_pub_hash); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + " ego_place_pub_hash = %s\n", GNUNET_h2s (&ego_place_pub_hash)); + + struct GNUNET_CONTAINER_MultiHashMap * + app_places = GNUNET_CONTAINER_multihashmap_get (apps_places, &app_id_hash); + if (NULL == app_places) + { + app_places = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); + GNUNET_CONTAINER_multihashmap_put (apps_places, &app_id_hash, app_places, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + } + + if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains (app_places, &ego_place_pub_hash)) + return GNUNET_NO; + + if (GNUNET_SYSERR == place_add (ereq)) + return GNUNET_SYSERR; + + if (GNUNET_OK != GNUNET_CONTAINER_multihashmap_put (app_places, &ego_place_pub_hash, NULL, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST)) + { + 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; +} + + +/** + * Save place entry message to disk. + * + * @param app_id + * Application ID. + * @param ereq + * Entry request message. + */ +static int +app_place_save (const char *app_id, + const struct PlaceEnterRequest *ereq) +{ + app_place_add (app_id, ereq); + + if (NULL == dir_places) + return GNUNET_SYSERR; + + char *ego_pub_str = GNUNET_CRYPTO_ecdsa_public_key_to_string (&ereq->ego_pub_key); + char *place_pub_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&ereq->place_pub_key); + char *filename = NULL; + GNUNET_asprintf (&filename, "%s%c" "%s%c" "%s%c" "%s", + dir_social, DIR_SEPARATOR, + "places", DIR_SEPARATOR, + ego_pub_str, DIR_SEPARATOR, + place_pub_str); + int ret = GNUNET_DISK_directory_create_for_file (filename); + if (GNUNET_OK != ret + || 0 > GNUNET_DISK_fn_write (filename, ereq, ntohs (ereq->header.size), + GNUNET_DISK_PERM_USER_READ + | GNUNET_DISK_PERM_USER_WRITE)) + { + GNUNET_break (0); + ret = GNUNET_SYSERR; + } + GNUNET_free (filename); + + if (ret == GNUNET_OK) + { + GNUNET_asprintf (&filename, "%s%c" "%s%c" "%s%c" "%s%c" "%s", + dir_social, DIR_SEPARATOR, + "apps", DIR_SEPARATOR, + app_id, DIR_SEPARATOR, + ego_pub_str, DIR_SEPARATOR, + place_pub_str); + ret = GNUNET_DISK_directory_create_for_file (filename); + if (GNUNET_OK != ret + || 0 > GNUNET_DISK_fn_write (filename, "", 0, + GNUNET_DISK_PERM_USER_READ + | GNUNET_DISK_PERM_USER_WRITE)) + { + GNUNET_break (0); + ret = GNUNET_SYSERR; + } + GNUNET_free (filename); + } + GNUNET_free (ego_pub_str); + GNUNET_free (place_pub_str); + return ret; +} + + +int +app_place_remove (const char *app_id, + const struct GNUNET_CRYPTO_EcdsaPublicKey *ego_pub_key, + const struct GNUNET_CRYPTO_EddsaPublicKey *place_pub_key) +{ + struct GNUNET_HashCode ego_pub_hash; + struct GNUNET_HashCode place_pub_hash; + GNUNET_CRYPTO_hash (ego_pub_key, sizeof (*ego_pub_key), &ego_pub_hash); + GNUNET_CRYPTO_hash (place_pub_key, sizeof (*place_pub_key), &place_pub_hash); + + char *ego_pub_str = GNUNET_CRYPTO_ecdsa_public_key_to_string (ego_pub_key); + char *place_pub_str = GNUNET_CRYPTO_eddsa_public_key_to_string (place_pub_key); + char *app_place_filename = NULL; + GNUNET_asprintf (&app_place_filename, + "%s%c" "%s%c" "%s%c" "%s%c" "%s", + dir_social, DIR_SEPARATOR, + "apps", DIR_SEPARATOR, + app_id, DIR_SEPARATOR, + ego_pub_str, DIR_SEPARATOR, + place_pub_str); + GNUNET_free (ego_pub_str); + GNUNET_free (place_pub_str); + + struct GNUNET_HashCode app_id_hash; + GNUNET_CRYPTO_hash (app_id, strlen (app_id) + 1, &app_id_hash); + + struct GNUNET_CONTAINER_MultiHashMap * + app_places = GNUNET_CONTAINER_multihashmap_get (apps_places, &app_id_hash); + + 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)) + { + GNUNET_break (0); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Error removing app place file: %s: %s (%d)\n", + app_place_filename, strerror (errno), errno); + ret = GNUNET_SYSERR; + } + GNUNET_free (app_place_filename); + + return ret; +} + + +/** + * Enter place as host. + * + * @param hreq + * Host entry request. + * @param[out] ret_hst + * Returned Host struct. + * + * @return #GNUNET_YES if the host entered the place just now, + * #GNUNET_NO if the place is already entered, + * #GNUNET_SYSERR if place_pub_key was set + * but its private key was not found + */ +static int +host_enter (const struct HostEnterRequest *hreq, struct Host **ret_hst) +{ + int ret = GNUNET_NO; + struct GNUNET_HashCode place_pub_hash; + GNUNET_CRYPTO_hash (&hreq->place_pub_key, sizeof (hreq->place_pub_key), + &place_pub_hash); + struct Host *hst = GNUNET_CONTAINER_multihashmap_get (hosts, &place_pub_hash); + + if (NULL == hst) + { + hst = GNUNET_new (struct Host); + hst->policy = hreq->policy; + hst->join_reqs = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); + hst->relay_msgs = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); + + struct Place *plc = &hst->place; + place_init (plc); + plc->is_host = GNUNET_YES; + plc->pub_key = hreq->place_pub_key; + plc->pub_key_hash = place_pub_hash; + + GNUNET_CONTAINER_multihashmap_put (hosts, &plc->pub_key_hash, plc, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + hst->master = GNUNET_PSYC_master_start (cfg, &hreq->place_key, hst->policy, + &psyc_master_started, + &psyc_recv_join_request, + &psyc_recv_message, NULL, hst); + plc->channel = GNUNET_PSYC_master_get_channel (hst->master); + ret = GNUNET_YES; + } + + if (NULL != ret_hst) + *ret_hst = hst; + return ret; +} + + +static int +msg_proc_parse (const struct MsgProcRequest *mpreq, + uint32_t *flags, + const char **method_prefix, + struct GNUNET_HashCode *method_hash) +{ + uint8_t method_size = ntohs (mpreq->header.size) - sizeof (*mpreq); + uint16_t offset = GNUNET_STRINGS_buffer_tokenize ((const char *) &mpreq[1], + method_size, 1, method_prefix); + + if (0 == offset || offset != method_size || *method_prefix == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "offset = %u, method_size = %u, method_name = %s\n", + offset, method_size, *method_prefix); + return GNUNET_SYSERR; + } + + GNUNET_CRYPTO_hash (*method_prefix, method_size, method_hash); + *flags = ntohl (mpreq->flags); + return GNUNET_OK; +} + + +static int +check_client_msg_proc_set (void *cls, + const struct MsgProcRequest *mpreq) +{ + return GNUNET_OK; +} + + +/** + * Handle a client setting message proccesing flags for a method prefix. + */ +static void +handle_client_msg_proc_set (void *cls, + const struct MsgProcRequest *mpreq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + const char *method_prefix = NULL; + uint32_t flags = 0; + struct GNUNET_HashCode method_hash; + + if (GNUNET_OK != + msg_proc_parse (mpreq, &flags, &method_prefix, &method_hash)) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } +#if 0 + GNUNET_PSYC_slicer_method_remove (plc->slicer, method_prefix, + place_recv_relay_method, + place_recv_relay_modifier, + place_recv_relay_data, + place_recv_relay_eom); + GNUNET_PSYC_slicer_method_remove (plc->slicer, method_prefix, + place_recv_save_method, + NULL, + place_recv_save_data, + place_recv_save_eom); +#endif + if (flags & GNUNET_SOCIAL_MSG_PROC_RELAY) + { + GNUNET_PSYC_slicer_method_add (plc->slicer, method_prefix, NULL, + place_recv_relay_method, + place_recv_relay_modifier, + place_recv_relay_data, + place_recv_relay_eom, + plc); + } + if (flags & GNUNET_SOCIAL_MSG_PROC_SAVE) + { + GNUNET_PSYC_slicer_method_add (plc->slicer, method_prefix, NULL, + place_recv_save_method, + NULL, + place_recv_save_data, + place_recv_save_eom, + plc); + } + + /** @todo Save flags to be able to resume relaying/saving after restart */ + + GNUNET_SERVICE_client_continue (client); +} + + +/** + * Handle a connecting client requesting to clear all relay rules. + */ +static void +handle_client_msg_proc_clear (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + GNUNET_PSYC_slicer_clear (plc->slicer); + + GNUNET_SERVICE_client_continue (client); +} + + +static int +check_client_host_enter (void *cls, + const struct HostEnterRequest *hr) +{ + return GNUNET_OK; +} + + +/** + * Handle a connecting client entering a place as host. + */ +static void +handle_client_host_enter (void *cls, + const struct HostEnterRequest *hr) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + struct HostEnterRequest * + hreq = (struct HostEnterRequest *) GNUNET_copy_message (&hr->header); + + 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], + app_id_size, 1, &app_id); + if (0 == offset || offset != app_id_size || app_id == NULL) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "offset = %u, app_id_size = %u, app_id = %s\n", + offset, app_id_size, app_id); + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + struct Host *hst = NULL; + struct Place *plc = NULL; + int ret = GNUNET_OK; + + struct GNUNET_CRYPTO_EddsaPublicKey empty_pub_key; + memset (&empty_pub_key, 0, sizeof (empty_pub_key)); + + if (0 == memcmp (&hreq->place_pub_key, &empty_pub_key, sizeof (empty_pub_key))) + { // no public key set: create new private key & save the place + struct GNUNET_CRYPTO_EddsaPrivateKey * + place_key = GNUNET_CRYPTO_eddsa_key_create (); + hreq->place_key = *place_key; + GNUNET_CRYPTO_eddsa_key_get_public (place_key, &hreq->place_pub_key); + GNUNET_CRYPTO_eddsa_key_clear (place_key); + GNUNET_free (place_key); + + app_place_save (app_id, (const struct PlaceEnterRequest *) hreq); + } + + switch (host_enter (hreq, &hst)) + { + case GNUNET_YES: + plc = c->place = &hst->place; + plc->host = hst; + break; + + case GNUNET_NO: + { + plc = c->place = &hst->place; + plc->host = hst; + client_send_host_enter_ack (client, hst, GNUNET_OK); + break; + } + case GNUNET_SYSERR: + ret = GNUNET_SYSERR; + } + + if (ret != GNUNET_SYSERR) + { + + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%p Client connected as host to place %s.\n", + hst, GNUNET_h2s (&plc->pub_key_hash)); + + struct ClientListItem *cli = GNUNET_new (struct ClientListItem); + cli->client = client; + GNUNET_CONTAINER_DLL_insert (plc->clients_head, plc->clients_tail, cli); + c->place = plc; + } + + GNUNET_CRYPTO_eddsa_key_clear (&hreq->place_key); + GNUNET_free (hreq); + + if (GNUNET_OK == ret) + GNUNET_SERVICE_client_continue (client); + else + GNUNET_SERVICE_client_drop (client); +} + + +/** + * Enter place as guest. + * + * @param greq + * Guest entry request. + * @param[out] ret_gst + * Returned Guest struct. + * + * @return #GNUNET_YES if the guest entered the place just now, + * #GNUNET_NO if the place is already entered, + * #GNUNET_SYSERR on error. + */ +static int +guest_enter (const struct GuestEnterRequest *greq, struct Guest **ret_gst) +{ + int ret = GNUNET_NO; + uint16_t greq_size = ntohs (greq->header.size); + + struct GNUNET_CRYPTO_EcdsaPublicKey ego_pub_key = greq->ego_pub_key; + struct GNUNET_HashCode ego_pub_hash; + GNUNET_CRYPTO_hash (&ego_pub_key, sizeof (ego_pub_key), &ego_pub_hash); + struct Ego *ego = GNUNET_CONTAINER_multihashmap_get (egos, &ego_pub_hash); + + if (NULL == ego) + return GNUNET_SYSERR; + + struct GNUNET_HashCode place_pub_hash; + GNUNET_CRYPTO_hash (&greq->place_pub_key, sizeof (greq->place_pub_key), + &place_pub_hash); + + struct GNUNET_CONTAINER_MultiHashMap * + plc_gst = GNUNET_CONTAINER_multihashmap_get (place_guests, &place_pub_hash); + struct Guest *gst = NULL; + + if (NULL != plc_gst) + gst = GNUNET_CONTAINER_multihashmap_get (plc_gst, &ego_pub_hash); + + if (NULL == gst || NULL == gst->slave) { gst = GNUNET_new (struct Guest); - gst->priv_key = req->guest_key; - gst->pub_key = gst_pub_key; - gst->pub_key_hash = gst_pub_key_hash; - gst->origin = req->origin; - gst->relay_count = ntohl (req->relay_count); - - const struct GNUNET_PeerIdentity * - relays = (const struct GNUNET_PeerIdentity *) &req[1]; + gst->origin = greq->origin; + gst->relay_count = ntohl (greq->relay_count); + + uint16_t len; + uint16_t remaining = ntohs (greq->header.size) - sizeof (*greq); + const char *app_id = (const char *) &greq[1]; + const char *p = app_id; + + len = strnlen (app_id, remaining); + if (len == remaining) + { + GNUNET_free (gst); + GNUNET_break (0); + return GNUNET_SYSERR; + } + p += len + 1; + remaining -= len + 1; + + const struct GNUNET_PeerIdentity *relays = NULL; uint16_t relay_size = gst->relay_count * sizeof (*relays); + if (remaining < relay_size) + { + GNUNET_free (gst); + GNUNET_break (0); + return GNUNET_SYSERR; + } + if (0 < relay_size) + relays = (const struct GNUNET_PeerIdentity *) p; + p += relay_size; + remaining -= relay_size; + struct GNUNET_PSYC_Message *join_msg = NULL; uint16_t join_msg_size = 0; - if (sizeof (*req) + relay_size + sizeof (struct GNUNET_MessageHeader) - <= req_size) + if (sizeof (struct GNUNET_MessageHeader) <= remaining) { - join_msg = (struct GNUNET_PSYC_Message *) - (((char *) &req[1]) + relay_size); + join_msg = (struct GNUNET_PSYC_Message *) p; join_msg_size = ntohs (join_msg->header.size); + p += join_msg_size; + remaining -= join_msg_size; } - if (sizeof (*req) + relay_size + join_msg_size != req_size) + if (0 != remaining) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "%u + %u + %u != %u\n", - sizeof (*req), relay_size, join_msg_size, req_size); - GNUNET_break (0); - GNUNET_SERVER_client_disconnect (client); + "%zu + %u + %u != %u\n", + sizeof (*greq), relay_size, join_msg_size, greq_size); GNUNET_free (gst); - return; + GNUNET_break (0); + return GNUNET_SYSERR; } - if (0 < gst->relay_count) + if (0 < relay_size) { gst->relays = GNUNET_malloc (relay_size); - memcpy (gst->relays, &req[1], relay_size); + GNUNET_memcpy (gst->relays, relays, relay_size); } - plc = &gst->plc; - plc->is_host = GNUNET_NO; - plc->pub_key = req->place_key; - plc->pub_key_hash = pub_key_hash; + gst->join_flags = ntohl (greq->flags); + + struct Place *plc = &gst->place; place_init (plc); + plc->is_host = GNUNET_NO; + plc->pub_key = greq->place_pub_key; + plc->pub_key_hash = place_pub_hash; + plc->ego_pub_key = ego_pub_key; + plc->ego_pub_hash = ego_pub_hash; + plc->ego_key = ego->key; if (NULL == plc_gst) { @@ -763,20 +1711,72 @@ client_recv_guest_enter (void *cls, struct GNUNET_SERVER_Client *client, (void) GNUNET_CONTAINER_multihashmap_put (place_guests, &plc->pub_key_hash, plc_gst, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); } - (void) GNUNET_CONTAINER_multihashmap_put (plc_gst, &gst->pub_key_hash, gst, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + (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_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); gst->slave - = GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &gst->priv_key, - &gst->origin, gst->relay_count, gst->relays, - &psyc_recv_message, NULL, &psyc_slave_connected, - &psyc_recv_join_dcsn, gst, join_msg); - gst->plc.channel = GNUNET_PSYC_slave_get_channel (gst->slave); + = GNUNET_PSYC_slave_join (cfg, &plc->pub_key, &plc->ego_key, + gst->join_flags, &gst->origin, + gst->relay_count, gst->relays, + &psyc_recv_message, NULL, + &psyc_slave_connected, + &psyc_recv_join_dcsn, + gst, join_msg); + plc->channel = GNUNET_PSYC_slave_get_channel (gst->slave); + ret = GNUNET_YES; } - else + + if (NULL != ret_gst) + *ret_gst = gst; + return ret; +} + + +static int +check_client_guest_enter (void *cls, + const struct GuestEnterRequest *greq) +{ + return GNUNET_OK; +} + + +/** + * Handle a connecting client entering a place as guest. + */ +static void +handle_client_guest_enter (void *cls, + const struct GuestEnterRequest *greq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + 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); + if (0 == offset) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + struct Guest *gst = NULL; + struct Place *plc = NULL; + + switch (guest_enter (greq, &gst)) + { + case GNUNET_YES: + plc = c->place = &gst->place; + plc->guest = gst; + app_place_save (app_id, (const struct PlaceEnterRequest *) greq); + break; + + case GNUNET_NO: { - plc = &gst->plc; + plc = c->place = &gst->place; + plc->guest = gst; struct GNUNET_PSYC_CountersResultMessage res; res.header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_ACK); @@ -784,16 +1784,16 @@ client_recv_guest_enter (void *cls, struct GNUNET_SERVER_Client *client, res.result_code = htonl (GNUNET_OK); res.max_message_id = GNUNET_htonll (plc->max_message_id); - GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_notification_context_unicast (nc, client, &res.header, - GNUNET_NO); + client_send_msg (client, &res.header); if (NULL != gst->join_dcsn) - { - GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_notification_context_unicast (nc, client, - &gst->join_dcsn->header, - GNUNET_NO); - } + client_send_msg (client, &gst->join_dcsn->header); + + break; + } + case GNUNET_SYSERR: + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -804,10 +1804,415 @@ client_recv_guest_enter (void *cls, struct GNUNET_SERVER_Client *client, cli->client = client; GNUNET_CONTAINER_DLL_insert (plc->clients_head, plc->clients_tail, cli); - struct Client *ctx = GNUNET_new (struct Client); - ctx->plc = plc; - GNUNET_SERVER_client_set_user_context (client, ctx); - GNUNET_SERVER_receive_done (client, GNUNET_OK); + c->place = plc; + GNUNET_SERVICE_client_continue (client); +} + + +struct GuestEnterByNameClosure +{ + struct Client *client; + char *app_id; + char *password; + struct GNUNET_CRYPTO_EcdsaPublicKey ego_pub_key; + struct GNUNET_MessageHeader *join_msg; +}; + + +/** + * Result of a GNS name lookup for entering a place. + * + * @see GNUNET_SOCIAL_guest_enter_by_name + */ +static void +gns_result_guest_enter (void *cls, uint32_t rd_count, + const struct GNUNET_GNSRECORD_Data *rd) +{ + struct GuestEnterByNameClosure *gcls = cls; + struct Client *c = gcls->client; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%p GNS result: %u records.\n", + c, rd_count); + + const struct GNUNET_GNSRECORD_PlaceData * + rec = (const struct GNUNET_GNSRECORD_PlaceData *) rd->data; + + if (0 == rd_count || rd->data_size < sizeof (*rec)) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (c->client); + return; + } + + uint16_t relay_count = ntohl (rec->relay_count); + struct GNUNET_PeerIdentity *relays = NULL; + + if (0 < relay_count) + { + if (rd->data_size == sizeof (*rec) + relay_count * sizeof (struct GNUNET_PeerIdentity)) + { + relays = (struct GNUNET_PeerIdentity *) &rec[1]; + } + else + { + relay_count = 0; + GNUNET_break_op (0); + } + } + + uint16_t app_id_size = strlen (gcls->app_id) + 1; + uint16_t relay_size = relay_count * sizeof (*relays); + uint16_t join_msg_size = 0; + if (NULL != gcls->join_msg) + join_msg_size = ntohs (gcls->join_msg->size); + uint16_t greq_size = sizeof (struct GuestEnterRequest) + + app_id_size + relay_size + join_msg_size; + struct GuestEnterRequest *greq = GNUNET_malloc (greq_size); + greq->header.size = htons (greq_size); + greq->header.type = htons (GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER); + greq->ego_pub_key = gcls->ego_pub_key; + greq->place_pub_key = rec->place_pub_key; + greq->origin = rec->origin; + greq->relay_count = rec->relay_count; + + void *p = &greq[1]; + GNUNET_memcpy (p, gcls->app_id, app_id_size); + p += app_id_size; + GNUNET_memcpy (p, relays, relay_size); + p += relay_size; + GNUNET_memcpy (p, gcls->join_msg, join_msg_size); + + handle_client_guest_enter (c, greq); + + GNUNET_free (gcls->app_id); + if (NULL != gcls->password) + GNUNET_free (gcls->password); + if (NULL != gcls->join_msg) + GNUNET_free (gcls->join_msg); + GNUNET_free (gcls); + GNUNET_free (greq); +} + + +static int +check_client_guest_enter_by_name (void *cls, + const struct GuestEnterByNameRequest *greq) +{ + return GNUNET_OK; +} + + +/** + * Handle a connecting client entering a place as guest using a GNS address. + * + * Look up GNS address and generate a GuestEnterRequest from that. + */ +static void +handle_client_guest_enter_by_name (void *cls, + const struct GuestEnterByNameRequest *greq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + struct GuestEnterByNameClosure *gcls = GNUNET_malloc (sizeof (*gcls)); + gcls->client = c; + gcls->ego_pub_key = greq->ego_pub_key; + + const char *p = (const char *) &greq[1]; + const char *app_id = NULL, *password = NULL, *gns_name = NULL; + uint16_t remaining = ntohs (greq->header.size) - sizeof (*greq); + uint16_t offset = GNUNET_STRINGS_buffer_tokenize (p, remaining, 3, + &app_id, + &gns_name, + &password); + p += offset; + remaining -= offset; + + if (0 != offset && sizeof (*gcls->join_msg) <= remaining) + { + gcls->join_msg = GNUNET_copy_message ((struct GNUNET_MessageHeader *) p); + remaining -= ntohs (gcls->join_msg->size); + } + + if (0 == offset || 0 != remaining) + { + if (NULL != gcls->join_msg) + GNUNET_free (gcls->join_msg); + GNUNET_free (gcls); + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + uint16_t app_id_size = strlen (app_id) + 1; + gcls->app_id = GNUNET_malloc (app_id_size); + GNUNET_memcpy (gcls->app_id, app_id, app_id_size); + + uint16_t password_size = strlen (password); + if (0 < password_size++) + { + gcls->password = GNUNET_malloc (password_size); + GNUNET_memcpy (gcls->password, password, password_size); + } + + GNUNET_GNS_lookup (gns, gns_name, &greq->ego_pub_key, + GNUNET_GNSRECORD_TYPE_PLACE, GNUNET_GNS_LO_DEFAULT, + NULL, gns_result_guest_enter, gcls); +} + + +void +app_notify_place (struct GNUNET_MessageHeader *msg, + struct GNUNET_SERVICE_Client *client) +{ + 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: + 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; + 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; + break; + + default: + return; + } + + client_send_msg (client, &amsg.header); +} + + +void +app_notify_place_end (struct GNUNET_SERVICE_Client *client) +{ + 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); +} + + +void +app_notify_ego (struct Ego *ego, struct GNUNET_SERVICE_Client *client) +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%p Sending ego notification to client: %s\n", + client, ego->name); + + 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_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); +} + + +void +app_notify_ego_end (struct GNUNET_SERVICE_Client *client) +{ + 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); +} + + +int +app_place_entry_notify (void *cls, const struct GNUNET_HashCode *key, void *value) +{ + struct GNUNET_MessageHeader * + msg = GNUNET_CONTAINER_multihashmap_get (places, key); + if (NULL != msg) + app_notify_place (msg, cls); + return GNUNET_YES; +} + + +int +ego_entry (void *cls, const struct GNUNET_HashCode *key, void *value) +{ + app_notify_ego (value, cls); + return GNUNET_YES; +} + + +static int +check_client_app_connect (void *cls, + const struct AppConnectRequest *creq) +{ + return GNUNET_OK; +} + + +/** + * Handle application connection. + */ +static void +handle_client_app_connect (void *cls, + const struct AppConnectRequest *creq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + uint8_t app_id_size = ntohs (creq->header.size) - sizeof (*creq); + const char *app_id = NULL; + uint16_t offset = GNUNET_STRINGS_buffer_tokenize ((const char *) &creq[1], + app_id_size, 1, &app_id); + if (0 == offset || offset != app_id_size) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + struct GNUNET_HashCode app_id_hash; + GNUNET_CRYPTO_hash (app_id, app_id_size, &app_id_hash); + + GNUNET_CONTAINER_multihashmap_iterate (egos, ego_entry, client); + app_notify_ego_end (client); + + struct GNUNET_CONTAINER_MultiHashMap * + app_places = GNUNET_CONTAINER_multihashmap_get (apps_places, &app_id_hash); + if (NULL != app_places) + GNUNET_CONTAINER_multihashmap_iterate (app_places, app_place_entry_notify, client); + app_notify_place_end (client); + + struct ClientListItem *cli = GNUNET_new (struct ClientListItem); + cli->client = client; + struct Application *app = GNUNET_CONTAINER_multihashmap_get (apps, + &app_id_hash); + if (NULL == app) { + app = GNUNET_malloc (sizeof (*app)); + (void) GNUNET_CONTAINER_multihashmap_put (apps, &app_id_hash, app, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + } + GNUNET_CONTAINER_DLL_insert (app->clients_head, app->clients_tail, cli); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%p Application %s connected.\n", app, app_id); + + c->app_id = GNUNET_malloc (app_id_size); + GNUNET_memcpy (c->app_id, app_id, app_id_size); + + GNUNET_SERVICE_client_continue (client); +} + + +/** + * Handle application detach request. + */ +static void +handle_client_app_detach (void *cls, + const struct AppDetachRequest *req) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + int ret = app_place_remove (c->app_id, &req->ego_pub_key, &req->place_pub_key); + client_send_result (client, req->op_id, ret, NULL, 0); + + GNUNET_SERVICE_client_continue (client); +} + + +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. + */ +static void +handle_client_place_leave (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + 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 */ + struct ClientListItem *cli = plc->clients_head, *next; + while (NULL != cli) + { + GNUNET_CONTAINER_DLL_remove (plc->clients_head, plc->clients_tail, cli); + GNUNET_SERVICE_client_drop (cli->client); + next = cli->next; + GNUNET_free (cli); + cli = next; + } + + if (GNUNET_YES != plc->is_disconnected) + { + plc->is_disconnected = GNUNET_YES; + if (NULL != plc->tmit_msgs_head) + { /* Send pending messages to PSYC before cleanup. */ + psyc_transmit_message (plc); + } + else + { + cleanup_place (plc); + } + } } @@ -833,44 +2238,55 @@ psyc_send_join_decision (void *cls, const struct GNUNET_HashCode *pub_key_hash, } +static int +check_client_join_decision (void *cls, + const struct GNUNET_PSYC_JoinDecisionMessage *dcsn) +{ + return GNUNET_OK; +} + + /** * Handle an entry decision from a host client. */ static void -client_recv_join_decision (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *msg) +handle_client_join_decision (void *cls, + const struct GNUNET_PSYC_JoinDecisionMessage *dcsn) { - struct Client * - ctx = GNUNET_SERVER_client_get_user_context (client, struct Client); - GNUNET_assert (NULL != ctx); - struct Place *plc = ctx->plc; - GNUNET_assert (GNUNET_YES == plc->is_host); - struct Host *hst = (struct Host *) plc; + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc || GNUNET_YES != plc->is_host) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + struct Host *hst = plc->host; - struct GNUNET_PSYC_JoinDecisionMessage * - dcsn = (struct GNUNET_PSYC_JoinDecisionMessage *) msg; struct JoinDecisionClosure jcls; jcls.is_admitted = ntohl (dcsn->is_admitted); jcls.msg - = (sizeof (*dcsn) + sizeof (*jcls.msg) <= ntohs (msg->size)) + = (sizeof (*dcsn) + sizeof (*jcls.msg) <= ntohs (dcsn->header.size)) ? (struct GNUNET_PSYC_Message *) &dcsn[1] : NULL; - struct GNUNET_HashCode slave_key_hash; - GNUNET_CRYPTO_hash (&dcsn->slave_key, sizeof (dcsn->slave_key), - &slave_key_hash); + struct GNUNET_HashCode slave_pub_hash; + GNUNET_CRYPTO_hash (&dcsn->slave_pub_key, sizeof (dcsn->slave_pub_key), + &slave_pub_hash); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Got join decision (%d) from client for place %s..\n", hst, jcls.is_admitted, GNUNET_h2s (&plc->pub_key_hash)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p ..and slave %s.\n", - hst, GNUNET_h2s (&slave_key_hash)); + hst, GNUNET_h2s (&slave_pub_hash)); - GNUNET_CONTAINER_multihashmap_get_multiple (hst->join_reqs, &slave_key_hash, + GNUNET_CONTAINER_multihashmap_get_multiple (hst->join_reqs, &slave_pub_hash, &psyc_send_join_decision, &jcls); - GNUNET_CONTAINER_multihashmap_remove_all (hst->join_reqs, &slave_key_hash); - GNUNET_SERVER_receive_done (client, GNUNET_OK); + GNUNET_CONTAINER_multihashmap_remove_all (hst->join_reqs, &slave_pub_hash); + + GNUNET_SERVICE_client_continue (client); } @@ -882,14 +2298,12 @@ client_recv_join_decision (void *cls, struct GNUNET_SERVER_Client *client, * @param plc The place struct for the client. */ static void -send_message_ack (struct Place *plc, struct GNUNET_SERVER_Client *client) +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); - - GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_notification_context_unicast (nc, client, &res, GNUNET_NO); + client_send_msg (client, &res); } @@ -996,7 +2410,7 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data) plc, pdata_size); *data_size = pdata_size; - memcpy (data, &pmsg[1], *data_size); + GNUNET_memcpy (data, &pmsg[1], *data_size); ret = GNUNET_NO; break; @@ -1022,8 +2436,8 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data) *data_size = 0; tmit_msg = psyc_transmit_queue_next_msg (plc, tmit_msg); plc->is_disconnected = GNUNET_YES; - GNUNET_SERVER_client_disconnect (tmit_frag->client); - GNUNET_SCHEDULER_add_now (&schedule_cleanup_place, plc); + GNUNET_SERVICE_client_drop (tmit_frag->client); + GNUNET_SCHEDULER_add_now (&cleanup_place, plc); return ret; } else @@ -1131,7 +2545,7 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data, *full_value_size = ntohl (pmod->value_size); *oper = pmod->oper; *data_size = mod_size; - memcpy (data, &pmod[1], mod_size); + GNUNET_memcpy (data, &pmod[1], mod_size); ret = GNUNET_NO; break; } @@ -1157,7 +2571,7 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data, "%p psyc_transmit_notify_mod: sending %u bytes.\n", plc, mod_size); *data_size = mod_size; - memcpy (data, &pmsg[1], *data_size); + GNUNET_memcpy (data, &pmsg[1], *data_size); ret = GNUNET_NO; break; } @@ -1182,8 +2596,8 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data, ret = GNUNET_SYSERR; tmit_msg = psyc_transmit_queue_next_msg (plc, tmit_msg); plc->is_disconnected = GNUNET_YES; - GNUNET_SERVER_client_disconnect (tmit_frag->client); - GNUNET_SCHEDULER_add_now (&schedule_cleanup_place, plc); + GNUNET_SERVICE_client_drop (tmit_frag->client); + GNUNET_SCHEDULER_add_now (&cleanup_place, plc); } else { @@ -1272,18 +2686,15 @@ guest_transmit_notify_mod (void *cls, uint16_t *data_size, void *data, /** * Get method part of next message from transmission queue. * - * @param tmit_msg - * Next item in message transmission queue. - * @param[out] pmeth - * The message method is returned here. + * @param plc + * Place * * @return #GNUNET_OK on success * #GNUNET_NO if there are no more messages in queue. * #GNUNET_SYSERR if the next message is malformed. */ -static int -psyc_transmit_queue_next_method (struct Place *plc, - struct GNUNET_PSYC_MessageMethod **pmeth) +static struct GNUNET_PSYC_MessageMethod * +psyc_transmit_queue_next_method (struct Place *plc) { struct MessageTransmitQueue *tmit_msg = plc->tmit_msgs_head; if (NULL == tmit_msg) @@ -1302,27 +2713,30 @@ psyc_transmit_queue_next_method (struct Place *plc, { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%p psyc_transmit_queue_next_method: unexpected message part of type %u.\n", - plc, ntohs (pmsg->type)); + plc, NULL != pmsg ? ntohs (pmsg->type) : 0); GNUNET_break (0); - return GNUNET_SYSERR; + return NULL; } uint16_t psize = ntohs (pmsg->size); - *pmeth = (struct GNUNET_PSYC_MessageMethod *) pmsg; - if (psize < sizeof (**pmeth) + 1 || '\0' != *((char *) *pmeth + psize - 1)) + struct GNUNET_PSYC_MessageMethod * + pmeth = (struct GNUNET_PSYC_MessageMethod *) GNUNET_copy_message (pmsg); + + if (psize < sizeof (*pmeth) + 1 || '\0' != *((char *) pmeth + psize - 1)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%p psyc_transmit_queue_next_method: invalid method name.\n", - plc, ntohs (pmsg->type)); + plc); GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "%u <= %u || NUL != %u\n", - sizeof (**pmeth), psize, *((char *) *pmeth + psize - 1)); + "%zu <= %u || NUL != %u\n", + sizeof (*pmeth), psize, *((char *) pmeth + psize - 1)); GNUNET_break (0); - return GNUNET_SYSERR; + GNUNET_free (pmeth); + return NULL; } psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag); - return GNUNET_OK; + return pmeth; } @@ -1332,19 +2746,24 @@ psyc_transmit_queue_next_method (struct Place *plc, static int psyc_master_transmit_message (struct Host *hst) { + struct Place *plc = &hst->place; if (NULL == hst->tmit_handle) { - struct GNUNET_PSYC_MessageMethod *pmeth = NULL; - int ret = psyc_transmit_queue_next_method (&hst->plc, &pmeth); - if (GNUNET_OK != ret) - return ret; - - hst->tmit_handle - = GNUNET_PSYC_master_transmit (hst->master, (const char *) &pmeth[1], - &host_transmit_notify_mod, - &host_transmit_notify_data, hst, - pmeth->flags); + struct GNUNET_PSYC_MessageMethod * + pmeth = psyc_transmit_queue_next_method (plc); + if (NULL == pmeth) + return GNUNET_SYSERR; + + hst->tmit_handle = (void *) &hst->tmit_handle; + struct GNUNET_PSYC_MasterTransmitHandle * + tmit_handle = GNUNET_PSYC_master_transmit (hst->master, (const char *) &pmeth[1], + &host_transmit_notify_mod, + &host_transmit_notify_data, hst, + pmeth->flags); + if (NULL != hst->tmit_handle) + hst->tmit_handle = tmit_handle; + GNUNET_free (pmeth); } else { @@ -1360,18 +2779,24 @@ psyc_master_transmit_message (struct Host *hst) static int psyc_slave_transmit_message (struct Guest *gst) { + struct Place *plc = &gst->place; + if (NULL == gst->tmit_handle) { - struct GNUNET_PSYC_MessageMethod *pmeth = NULL; - int ret = psyc_transmit_queue_next_method (&gst->plc, &pmeth); - if (GNUNET_OK != ret) - return ret; - - gst->tmit_handle - = GNUNET_PSYC_slave_transmit (gst->slave, (const char *) &pmeth[1], - &guest_transmit_notify_mod, - &guest_transmit_notify_data, gst, - pmeth->flags); + struct GNUNET_PSYC_MessageMethod * + pmeth = psyc_transmit_queue_next_method (plc); + if (NULL == pmeth) + return GNUNET_SYSERR; + + gst->tmit_handle = (void *) &gst->tmit_handle; + struct GNUNET_PSYC_SlaveTransmitHandle * + tmit_handle = GNUNET_PSYC_slave_transmit (gst->slave, (const char *) &pmeth[1], + &guest_transmit_notify_mod, + &guest_transmit_notify_data, gst, + pmeth->flags); + if (NULL != gst->tmit_handle) + gst->tmit_handle = tmit_handle; + GNUNET_free (pmeth); } else { @@ -1406,7 +2831,7 @@ psyc_transmit_message (struct Place *plc) */ static struct MessageTransmitQueue * psyc_transmit_queue_message (struct Place *plc, - struct GNUNET_SERVER_Client *client, + struct GNUNET_SERVICE_Client *client, size_t data_size, const void *data, uint16_t first_ptype, uint16_t last_ptype, @@ -1424,7 +2849,7 @@ psyc_transmit_queue_message (struct Place *plc, struct FragmentTransmitQueue * tmit_frag = GNUNET_malloc (sizeof (*tmit_frag) + data_size); - memcpy (&tmit_frag[1], data, data_size); + GNUNET_memcpy (&tmit_frag[1], data, data_size); tmit_frag->next_part = (struct GNUNET_MessageHeader *) &tmit_frag[1]; tmit_frag->client = client; tmit_frag->size = data_size; @@ -1442,7 +2867,7 @@ psyc_transmit_queue_message (struct Place *plc, * @param client Client the message originates from. */ static void -psyc_transmit_cancel (struct Place *plc, struct GNUNET_SERVER_Client *client) +psyc_transmit_cancel (struct Place *plc, struct GNUNET_SERVICE_Client *client) { uint16_t type = GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL; @@ -1457,17 +2882,31 @@ psyc_transmit_cancel (struct Place *plc, struct GNUNET_SERVER_Client *client) } +static int +check_client_psyc_message (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + return GNUNET_OK; +} + + /** * Handle an incoming message from a client, to be transmitted to the place. */ static void -client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *msg) +handle_client_psyc_message (void *cls, + const struct GNUNET_MessageHeader *msg) { - struct Client * - ctx = GNUNET_SERVER_client_get_user_context (client, struct Client); - GNUNET_assert (NULL != ctx); - struct Place *plc = ctx->plc; + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + int ret = GNUNET_SYSERR; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -1479,7 +2918,7 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%p Place is not ready yet, disconnecting client.\n", plc); GNUNET_break (0); - GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + GNUNET_SERVICE_client_drop (client); return; } @@ -1493,7 +2932,7 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, plc, psize); GNUNET_break (0); psyc_transmit_cancel (plc, client); - GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + GNUNET_SERVICE_client_drop (client); return; } @@ -1506,20 +2945,20 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, "%p Received invalid message part from client.\n", plc); GNUNET_break (0); psyc_transmit_cancel (plc, client); - GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + GNUNET_SERVICE_client_drop (client); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Received message with first part type %u and last part type %u.\n", plc, first_ptype, last_ptype); - ctx->tmit_msg + c->tmit_msg = psyc_transmit_queue_message (plc, client, psize, &msg[1], - first_ptype, last_ptype, ctx->tmit_msg); - if (NULL != ctx->tmit_msg) + first_ptype, last_ptype, c->tmit_msg); + if (NULL != c->tmit_msg) { if (GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END <= last_ptype) - ctx->tmit_msg = NULL; + c->tmit_msg = NULL; ret = psyc_transmit_message (plc); } @@ -1531,25 +2970,27 @@ client_recv_psyc_message (void *cls, struct GNUNET_SERVER_Client *client, psyc_transmit_cancel (plc, client); ret = GNUNET_SYSERR; } - GNUNET_SERVER_receive_done (client, ret); + + if (GNUNET_OK == ret) + GNUNET_SERVICE_client_continue (client); + else + GNUNET_SERVICE_client_drop (client); } /** - * A historic message result arrived from PSYC. + * A historic message arrived from PSYC. */ static void -psyc_recv_history_message (void *cls, - uint64_t message_id, - uint32_t flags, - const struct GNUNET_PSYC_MessageHeader *msg) +psyc_recv_history_message (void *cls, const struct GNUNET_PSYC_MessageHeader *msg) { struct OperationClosure *opcls = cls; - struct Place *plc = opcls->plc; + struct Client *c = opcls->client; + struct Place *plc = c->place; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p Received historic message #%" PRId64 " (flags: %x)\n", - plc, message_id, flags); + plc, GNUNET_ntohll (msg->message_id), ntohl (msg->flags)); uint16_t size = ntohs (msg->header.size); @@ -1558,27 +2999,44 @@ psyc_recv_history_message (void *cls, res->header.size = htons (sizeof (*res) + size); res->header.type = htons (GNUNET_MESSAGE_TYPE_PSYC_HISTORY_RESULT); res->op_id = opcls->op_id; - res->result_code = GNUNET_htonll_signed (GNUNET_OK); + res->result_code = GNUNET_htonll (GNUNET_OK); - memcpy (&res[1], msg, size); + GNUNET_memcpy (&res[1], msg, size); /** @todo FIXME: send only to requesting client */ - client_send_msg (plc, &res->header); + place_send_msg (plc, &res->header); + + GNUNET_free (res); } +/** + * Result of message history replay from PSYC. + */ static void psyc_recv_history_result (void *cls, int64_t result, const void *err_msg, uint16_t err_msg_size) { struct OperationClosure *opcls = cls; + struct Client *c = opcls->client; + struct Place *plc = c->place; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "%p History replay #%" PRIu64 ": " - "PSYCSTORE returned %" PRId64 " (%.*s)\n", - opcls->plc, GNUNET_ntohll (opcls->op_id), result, err_msg_size, err_msg); + "PSYCstore returned %" PRId64 " (%.*s)\n", + plc, GNUNET_ntohll (opcls->op_id), result, + err_msg_size, (const char *) err_msg); // FIXME: place might have been destroyed - client_send_result (opcls->client, opcls->op_id, result, err_msg, err_msg_size); + client_send_result (c->client, opcls->op_id, result, err_msg, err_msg_size); +} + + +static int +check_client_history_replay (void *cls, + const struct GNUNET_PSYC_HistoryRequestMessage *req) +{ + return GNUNET_OK; } @@ -1586,17 +3044,20 @@ psyc_recv_history_result (void *cls, int64_t result, * Client requests channel history. */ static void -client_recv_history_replay (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *msg) +handle_client_history_replay (void *cls, + const struct GNUNET_PSYC_HistoryRequestMessage *req) { - struct Client * - ctx = GNUNET_SERVER_client_get_user_context (client, struct Client); - GNUNET_assert (NULL != ctx); - struct Place *plc = ctx->plc; + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } - const struct GNUNET_PSYC_HistoryRequestMessage * - req = (const struct GNUNET_PSYC_HistoryRequestMessage *) msg; - uint16_t size = ntohs (msg->size); + uint16_t size = ntohs (req->header.size); const char *method_prefix = (const char *) &req[1]; if (size < sizeof (*req) + 1 @@ -1604,16 +3065,15 @@ client_recv_history_replay (void *cls, struct GNUNET_SERVER_Client *client, { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%p History replay #%" PRIu64 ": " - "invalid method prefix. size: %u < %u?\n", + "invalid method prefix. size: %u < %zu?\n", plc, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1); GNUNET_break (0); - GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + GNUNET_SERVICE_client_drop (client); return; } struct OperationClosure *opcls = GNUNET_malloc (sizeof (*opcls)); - opcls->client = client; - opcls->plc = plc; + opcls->client = c; opcls->op_id = req->op_id; opcls->flags = ntohl (req->flags); @@ -1622,45 +3082,481 @@ client_recv_history_replay (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_ntohll (req->start_message_id), GNUNET_ntohll (req->end_message_id), method_prefix, opcls->flags, - &psyc_recv_history_message, NULL, - &psyc_recv_history_result, opcls); + psyc_recv_history_message, NULL, + psyc_recv_history_result, opcls); else GNUNET_PSYC_channel_history_replay_latest (plc->channel, GNUNET_ntohll (req->message_limit), method_prefix, opcls->flags, - &psyc_recv_history_message, NULL, - &psyc_recv_history_result, opcls); + psyc_recv_history_message, NULL, + psyc_recv_history_result, opcls); - GNUNET_SERVER_receive_done (client, GNUNET_OK); + GNUNET_SERVICE_client_continue (client); } -static const struct GNUNET_SERVER_MessageHandler handlers[] = { - { &client_recv_host_enter, NULL, - GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER, 0 }, +/** + * A state variable part arrived from PSYC. + */ +void +psyc_recv_state_var (void *cls, + const struct GNUNET_MessageHeader *mod, + const char *name, + const void *value, + uint32_t value_size, + uint32_t full_value_size) +{ + struct OperationClosure *opcls = cls; + struct Client *c = opcls->client; + struct Place *plc = c->place; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%p Received state variable %s from PSYC\n", + plc, name); - { &client_recv_guest_enter, NULL, - GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER, 0 }, + uint16_t size = ntohs (mod->size); - { &client_recv_join_decision, NULL, - GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION, 0 }, + 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); - { &client_recv_psyc_message, NULL, - GNUNET_MESSAGE_TYPE_PSYC_MESSAGE, 0 }, + GNUNET_memcpy (&res[1], mod, size); - { &client_recv_history_replay, NULL, - GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY, 0 }, -#if FIXME - { &client_recv_state_get, NULL, - GNUNET_MESSAGE_TYPE_PSYC_STATE_GET, 0 }, + /** @todo FIXME: send only to requesting client */ + place_send_msg (plc, &res->header); - { &client_recv_state_get_prefix, NULL, - GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX, 0 }, -#endif - { NULL, NULL, 0, 0 } + GNUNET_free (res); +} + + +/** + * Result of retrieving state variable from PSYC. + */ +static void +psyc_recv_state_result (void *cls, int64_t result, + const void *err_msg, uint16_t err_msg_size) +{ + struct OperationClosure *opcls = cls; + struct Client *c = opcls->client; + struct Place *plc = c->place; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "%p State get #%" PRIu64 ": " + "PSYCstore returned %" PRId64 " (%.*s)\n", + plc, GNUNET_ntohll (opcls->op_id), result, + err_msg_size, (const char *) err_msg); + + // FIXME: place might have been destroyed + client_send_result (c->client, opcls->op_id, result, err_msg, err_msg_size); +} + + +static int +check_client_state_get (void *cls, + const struct GNUNET_PSYC_StateRequestMessage *req) +{ + return GNUNET_OK; +} + + +/** + * Client requests channel history. + */ +static void +handle_client_state_get (void *cls, + const struct GNUNET_PSYC_StateRequestMessage *req) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + struct Place *plc = c->place; + if (NULL == plc) + { + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + uint16_t size = ntohs (req->header.size); + const char *name = (const char *) &req[1]; + + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "%p State get #%" PRIu64 ": %s\n", + plc, GNUNET_ntohll (req->op_id), name); + + if (size < sizeof (*req) + 1 + || '\0' != name[size - sizeof (*req) - 1]) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "%p State get #%" PRIu64 ": " + "invalid name. size: %u < %zu?\n", + plc, GNUNET_ntohll (req->op_id), size, sizeof (*req) + 1); + GNUNET_break (0); + GNUNET_SERVICE_client_drop (client); + return; + } + + struct OperationClosure *opcls = GNUNET_malloc (sizeof (*opcls)); + opcls->client = c; + opcls->op_id = req->op_id; + + switch (ntohs (req->header.type)) + { + case GNUNET_MESSAGE_TYPE_PSYC_STATE_GET: + GNUNET_PSYC_channel_state_get (plc->channel, name, + psyc_recv_state_var, + psyc_recv_state_result, opcls); + break; + + case GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX: + GNUNET_PSYC_channel_state_get_prefix (plc->channel, name, + psyc_recv_state_var, + psyc_recv_state_result, opcls); + break; + + default: + GNUNET_assert (0); + } + + GNUNET_SERVICE_client_continue (client); +} + + +#define check_client_state_get_prefix check_client_state_get +#define handle_client_state_get_prefix handle_client_state_get + + +static void +namestore_recv_records_store_result (void *cls, int32_t result, + const char *err_msg) +{ + struct OperationClosure *opcls = cls; + struct Client *c = opcls->client; + + // FIXME: client might have been disconnected + client_send_result (c->client, opcls->op_id, result, err_msg, + (NULL != err_msg) ? strlen (err_msg) : 0); + GNUNET_free (opcls); +} + + +static int +check_client_zone_add_place (void *cls, + const struct ZoneAddPlaceRequest *preq) +{ + return GNUNET_OK; +} + + +/** + * Handle request to add PLACE record to GNS zone. + */ +static void +handle_client_zone_add_place (void *cls, + const struct ZoneAddPlaceRequest *preq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + uint16_t remaining = ntohs (preq->header.size) - sizeof (*preq); + const char *p = (const char *) &preq[1]; + const char *name = NULL, *password = NULL; + uint16_t offset = GNUNET_STRINGS_buffer_tokenize (p, remaining, 2, + &name, &password); + remaining -= offset; + p += offset; + const struct GNUNET_PeerIdentity * + relays = (const struct GNUNET_PeerIdentity *) p; + uint16_t relay_size = ntohl (preq->relay_count) * sizeof (*relays); + + if (0 == offset || remaining != relay_size) + { + GNUNET_break (0); + client_send_result (client, preq->op_id, GNUNET_SYSERR, NULL, 0); + GNUNET_SERVICE_client_drop (client); + return; + } + + struct GNUNET_GNSRECORD_Data rd = { }; + rd.record_type = GNUNET_GNSRECORD_TYPE_PLACE; + rd.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; + rd.expiration_time = GNUNET_ntohll (preq->expiration_time); + + struct GNUNET_GNSRECORD_PlaceData * + rec = GNUNET_malloc (sizeof (*rec) + relay_size); + rec->place_pub_key = preq->place_pub_key; + rec->origin = this_peer; + rec->relay_count = preq->relay_count; + GNUNET_memcpy (&rec[1], relays, relay_size); + + rd.data = rec; + rd.data_size = sizeof (*rec) + relay_size; + + struct GNUNET_HashCode ego_pub_hash; + GNUNET_CRYPTO_hash (&preq->ego_pub_key, sizeof (preq->ego_pub_key), &ego_pub_hash); + struct Ego *ego = GNUNET_CONTAINER_multihashmap_get (egos, &ego_pub_hash); + if (NULL == ego) + { + client_send_result (client, preq->op_id, GNUNET_SYSERR, NULL, 0); + } + else + { + struct OperationClosure *opcls = GNUNET_malloc (sizeof (*opcls)); + opcls->client = c; + opcls->op_id = preq->op_id; + GNUNET_NAMESTORE_records_store (namestore, &ego->key, + name, 1, &rd, + namestore_recv_records_store_result, opcls); + /** @todo refresh stored records later */ + } + GNUNET_SERVICE_client_continue (client); +} + + +static int +check_client_zone_add_nym (void *cls, + const struct ZoneAddNymRequest *nreq) +{ + return GNUNET_OK; +} + + +/** + * Handle request to add PLACE record to GNS zone. + */ +static void +handle_client_zone_add_nym (void *cls, + const struct ZoneAddNymRequest *nreq) +{ + struct Client *c = cls; + struct GNUNET_SERVICE_Client *client = c->client; + + uint16_t name_size = ntohs (nreq->header.size) - sizeof (*nreq); + const char *name = NULL; + uint16_t offset = GNUNET_STRINGS_buffer_tokenize ((const char *) &nreq[1], + name_size, 1, &name); + if (0 == offset || offset != name_size) + { + GNUNET_break (0); + client_send_result (client, nreq->op_id, GNUNET_SYSERR, NULL, 0); + GNUNET_SERVICE_client_continue (client); + return; + } + + struct GNUNET_GNSRECORD_Data rd = { }; + rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; + rd.flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; + rd.expiration_time = GNUNET_ntohll (nreq->expiration_time); + rd.data = &nreq->nym_pub_key; + rd.data_size = sizeof (nreq->nym_pub_key); + + struct GNUNET_HashCode ego_pub_hash; + GNUNET_CRYPTO_hash (&nreq->ego_pub_key, sizeof (nreq->ego_pub_key), &ego_pub_hash); + struct Ego *ego = GNUNET_CONTAINER_multihashmap_get (egos, &ego_pub_hash); + if (NULL == ego) + { + client_send_result (client, nreq->op_id, GNUNET_SYSERR, NULL, 0); + } + else + { + struct OperationClosure *opcls = GNUNET_malloc (sizeof (*opcls)); + opcls->client = c; + opcls->op_id = nreq->op_id; + GNUNET_NAMESTORE_records_store (namestore, &ego->key, + name, 1, &rd, + namestore_recv_records_store_result, opcls); + /** @todo refresh stored records later */ + } + GNUNET_SERVICE_client_continue (client); +} + + +const char * +path_basename (const char *path) +{ + const char *basename = strrchr (path, DIR_SEPARATOR); + if (NULL != basename) + basename++; + + if (NULL == basename || '\0' == basename) + return NULL; + + return basename; +} + + +struct PlaceLoadClosure +{ + const char *app_id; + const char *ego_pub_str; }; +/** Load a place file */ +int +file_place_load (void *cls, const char *place_filename) +{ + struct PlaceLoadClosure *plcls = cls; + + const char *place_pub_str = path_basename (place_filename); + if (NULL == place_pub_str) + { + GNUNET_break (0); + return GNUNET_OK; + } + + char *filename = NULL; + GNUNET_asprintf (&filename, "%s%c" "%s%c" "%s%c" "%s", + dir_social, DIR_SEPARATOR, + "places", DIR_SEPARATOR, + plcls->ego_pub_str, DIR_SEPARATOR, + place_pub_str); + + uint64_t file_size = 0; + if (GNUNET_OK != + GNUNET_DISK_file_size (filename, &file_size, GNUNET_YES, GNUNET_YES) + || file_size < sizeof (struct PlaceEnterRequest)) + { + GNUNET_free (filename); + return GNUNET_OK; + } + + struct PlaceEnterRequest *ereq = GNUNET_malloc (file_size); + ssize_t read_size = GNUNET_DISK_fn_read (filename, ereq, file_size); + GNUNET_free (filename); + if (read_size < 0 || read_size < sizeof (*ereq)) + { + GNUNET_free (ereq); + return GNUNET_OK; + } + + uint16_t ereq_size = ntohs (ereq->header.size); + if (read_size != ereq_size) + { + GNUNET_free (ereq); + return GNUNET_OK; + } + + switch (ntohs (ereq->header.type)) + { + case GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER: + if (ereq_size < sizeof (struct HostEnterRequest)) + { + GNUNET_free (ereq); + return GNUNET_OK; + } + struct HostEnterRequest *hreq = (struct HostEnterRequest *) ereq; + host_enter (hreq, NULL); + break; + + case GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER: + if (ereq_size < sizeof (struct GuestEnterRequest)) + { + GNUNET_free (ereq); + return GNUNET_OK; + } + struct GuestEnterRequest *greq = (struct GuestEnterRequest *) ereq; + guest_enter (greq, NULL); + break; + + default: + GNUNET_free (ereq); + return GNUNET_OK; + } + + app_place_add (plcls->app_id, ereq); + GNUNET_free (ereq); + return GNUNET_OK; +} + + +/** + * Read @e place_pub_str entries in @a dir_ego + * + * @param dir_ego + * Data directory of an application ego. + * $GNUNET_DATA_HOME/social/apps/$app_id/$ego_pub_str/ + */ +int +scan_app_ego_dir (void *cls, const char *dir_ego) +{ + struct PlaceLoadClosure *plcls = cls; + plcls->ego_pub_str = path_basename (dir_ego); + + if (NULL != plcls->ego_pub_str) + GNUNET_DISK_directory_scan (dir_ego, file_place_load, plcls); + + return GNUNET_OK; +} + +/** + * Read @e ego_pub_str entries in @a dir_app + * + * @param dir_app + * Data directory of an application. + * $GNUNET_DATA_HOME/social/apps/$app_id/ + */ +int +scan_app_dir (void *cls, const char *dir_app) +{ + if (GNUNET_YES != GNUNET_DISK_directory_test (dir_app, GNUNET_YES)) + return GNUNET_OK; + + struct PlaceLoadClosure plcls; + plcls.app_id = path_basename (dir_app); + + if (NULL != plcls.app_id) + GNUNET_DISK_directory_scan (dir_app, scan_app_ego_dir, &plcls); + + return GNUNET_OK; +} + + +static void +identity_recv_ego (void *cls, struct GNUNET_IDENTITY_Ego *id_ego, + void **ctx, const char *name) +{ + if (NULL == id_ego) // end of initial list of egos + return; + + struct GNUNET_CRYPTO_EcdsaPublicKey ego_pub_key; + GNUNET_IDENTITY_ego_get_public_key (id_ego, &ego_pub_key); + + struct GNUNET_HashCode ego_pub_hash; + GNUNET_CRYPTO_hash (&ego_pub_key, sizeof (ego_pub_key), &ego_pub_hash); + + struct Ego *ego = GNUNET_CONTAINER_multihashmap_get (egos, &ego_pub_hash); + if (NULL != ego) + { + GNUNET_free (ego->name); + if (NULL == name) // deleted + { + GNUNET_CONTAINER_multihashmap_remove (egos, &ego_pub_hash, ego); + GNUNET_free (ego); + ego = NULL; + } + } + else + { + ego = GNUNET_malloc (sizeof (*ego)); + } + if (NULL != ego) + { + ego->key = *(GNUNET_IDENTITY_ego_get_private_key (id_ego)); + size_t name_size = strlen (name) + 1; + ego->name = GNUNET_malloc (name_size); + GNUNET_memcpy (ego->name, name, name_size); + + GNUNET_CONTAINER_multihashmap_put (egos, &ego_pub_hash, ego, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); + } + + // FIXME: notify clients about changed ego +} + + /** * Initialize the PSYC service. * @@ -1669,36 +3565,118 @@ static const struct GNUNET_SERVER_MessageHandler handlers[] = { * @param c Configuration to use. */ static void -run (void *cls, struct GNUNET_SERVER_Handle *server, - const struct GNUNET_CONFIGURATION_Handle *c) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *c, + struct GNUNET_SERVICE_Handle *svc) { cfg = c; - stats = GNUNET_STATISTICS_create ("social", cfg); + service = svc; + GNUNET_CRYPTO_get_peer_identity (cfg, &this_peer); + hosts = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); guests = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); place_guests = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); - nc = GNUNET_SERVER_notification_context_create (server, 1); - GNUNET_SERVER_add_handlers (server, handlers); - GNUNET_SERVER_disconnect_notify (server, &client_disconnect, NULL); - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, - &shutdown_task, NULL); + + egos = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); + apps = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_NO); + places = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); + apps_places = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); + places_apps = GNUNET_CONTAINER_multihashmap_create(1, GNUNET_NO); + + id = GNUNET_IDENTITY_connect (cfg, &identity_recv_ego, NULL); + gns = GNUNET_GNS_connect (cfg); + namestore = GNUNET_NAMESTORE_connect (cfg); + stats = GNUNET_STATISTICS_create ("social", cfg); + + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_filename (cfg, "social", "DATA_HOME", + &dir_social)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "social", "DATA_HOME"); + GNUNET_break (0); + return; + } + GNUNET_asprintf (&dir_places, "%s%c%s", + dir_social, DIR_SEPARATOR, "places"); + GNUNET_asprintf (&dir_apps, "%s%c%s", + dir_social, DIR_SEPARATOR, "apps"); + + GNUNET_DISK_directory_scan (dir_apps, scan_app_dir, NULL); + + GNUNET_SCHEDULER_add_shutdown (shutdown_task, NULL); } /** - * The main function for the service. - * - * @param argc number of arguments from the command line - * @param argv command line arguments - * @return 0 ok, 1 on error + * Define "main" method using service macro. */ -int -main (int argc, char *const *argv) -{ - return (GNUNET_OK == - GNUNET_SERVICE_run (argc, argv, "social", - GNUNET_SERVICE_OPTION_NONE, - &run, NULL)) ? 0 : 1; -} +GNUNET_SERVICE_MAIN +("social", + GNUNET_SERVICE_OPTION_NONE, + run, + client_notify_connect, + client_notify_disconnect, + NULL, + GNUNET_MQ_hd_var_size (client_host_enter, + GNUNET_MESSAGE_TYPE_SOCIAL_HOST_ENTER, + struct HostEnterRequest, + NULL), + GNUNET_MQ_hd_var_size (client_guest_enter, + GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER, + struct GuestEnterRequest, + NULL), + GNUNET_MQ_hd_var_size (client_guest_enter_by_name, + GNUNET_MESSAGE_TYPE_SOCIAL_GUEST_ENTER_BY_NAME, + struct GuestEnterByNameRequest, + NULL), + GNUNET_MQ_hd_var_size (client_join_decision, + GNUNET_MESSAGE_TYPE_PSYC_JOIN_DECISION, + struct GNUNET_PSYC_JoinDecisionMessage, + NULL), + GNUNET_MQ_hd_var_size (client_psyc_message, + GNUNET_MESSAGE_TYPE_PSYC_MESSAGE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_var_size (client_history_replay, + GNUNET_MESSAGE_TYPE_PSYC_HISTORY_REPLAY, + struct GNUNET_PSYC_HistoryRequestMessage, + NULL), + GNUNET_MQ_hd_var_size (client_state_get, + GNUNET_MESSAGE_TYPE_PSYC_STATE_GET, + struct GNUNET_PSYC_StateRequestMessage, + NULL), + GNUNET_MQ_hd_var_size (client_state_get_prefix, + GNUNET_MESSAGE_TYPE_PSYC_STATE_GET_PREFIX, + struct GNUNET_PSYC_StateRequestMessage, + NULL), + GNUNET_MQ_hd_var_size (client_zone_add_place, + GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_PLACE, + struct ZoneAddPlaceRequest, + NULL), + GNUNET_MQ_hd_var_size (client_zone_add_nym, + GNUNET_MESSAGE_TYPE_SOCIAL_ZONE_ADD_NYM, + struct ZoneAddNymRequest, + NULL), + GNUNET_MQ_hd_var_size (client_app_connect, + GNUNET_MESSAGE_TYPE_SOCIAL_APP_CONNECT, + struct AppConnectRequest, + NULL), + GNUNET_MQ_hd_fixed_size (client_app_detach, + GNUNET_MESSAGE_TYPE_SOCIAL_APP_DETACH, + struct AppDetachRequest, + NULL), + GNUNET_MQ_hd_fixed_size (client_place_leave, + GNUNET_MESSAGE_TYPE_SOCIAL_PLACE_LEAVE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_var_size (client_msg_proc_set, + GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_SET, + struct MsgProcRequest, + NULL), + GNUNET_MQ_hd_fixed_size (client_msg_proc_clear, + GNUNET_MESSAGE_TYPE_SOCIAL_MSG_PROC_CLEAR, + struct GNUNET_MessageHeader, + NULL)); /* end of gnunet-service-social.c */