From a7ccf828ae4f7e306ffe3e7efebc0e678615f6c5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 17 Jul 2019 10:50:45 +0200 Subject: remove duplication MQ options, make conversation build --- src/set/gnunet-service-set.c | 772 +++++++++++++++++++------------------------ 1 file changed, 337 insertions(+), 435 deletions(-) (limited to 'src/set') diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index f1d94bef7..5becd7bd9 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -11,7 +11,7 @@ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . @@ -60,7 +60,6 @@ struct LazyCopyRequest * Cookie identifying the request. */ uint32_t cookie; - }; @@ -185,8 +184,7 @@ static uint32_t suggest_id; static struct Operation * get_incoming (uint32_t id) { - for (struct Listener *listener = listener_head; - NULL != listener; + for (struct Listener *listener = listener_head; NULL != listener; listener = listener->next) { for (struct Operation *op = listener->op_head; NULL != op; op = op->next) @@ -212,9 +210,7 @@ incoming_destroy (struct Operation *op) op); if (NULL != (listener = op->listener)) { - GNUNET_CONTAINER_DLL_remove (listener->op_head, - listener->op_tail, - op); + GNUNET_CONTAINER_DLL_remove (listener->op_head, listener->op_tail, op); op->listener = NULL; } if (NULL != op->timeout_task) @@ -246,7 +242,6 @@ struct GarbageContext * Largest generation for which an operation is still pending. */ unsigned int max_op_generation; - }; @@ -260,9 +255,7 @@ struct GarbageContext * @return #GNUNET_OK (continue to iterate) */ static int -garbage_collect_cb (void *cls, - const struct GNUNET_HashCode *key, - void *value) +garbage_collect_cb (void *cls, const struct GNUNET_HashCode *key, void *value) { //struct GarbageContext *gc = cls; //struct ElementEntry *ee = value; @@ -298,10 +291,10 @@ collect_generation_garbage (struct Set *set) gc.max_op_generation = 0; for (struct Operation *op = set->ops_head; NULL != op; op = op->next) { - gc.min_op_generation = GNUNET_MIN (gc.min_op_generation, - op->generation_created); - gc.max_op_generation = GNUNET_MAX (gc.max_op_generation, - op->generation_created); + gc.min_op_generation = + GNUNET_MIN (gc.min_op_generation, op->generation_created); + gc.max_op_generation = + GNUNET_MAX (gc.max_op_generation, op->generation_created); } gc.map = set->content->elements; GNUNET_CONTAINER_multihashmap_iterate (set->content->elements, @@ -324,8 +317,7 @@ is_excluded_generation (unsigned int generation, unsigned int excluded_size) { for (unsigned int i = 0; i < excluded_size; i++) - if ( (generation >= excluded[i].start) && - (generation < excluded[i].end) ) + if ((generation >= excluded[i].start) && (generation < excluded[i].end)) return GNUNET_YES; return GNUNET_NO; } @@ -351,9 +343,7 @@ is_element_of_generation (struct ElementEntry *ee, GNUNET_assert (NULL != ee->mutations); if (GNUNET_YES == - is_excluded_generation (query_generation, - excluded, - excluded_size)) + is_excluded_generation (query_generation, excluded, excluded_size)) { GNUNET_break (0); return GNUNET_NO; @@ -376,9 +366,7 @@ is_element_of_generation (struct ElementEntry *ee, } if (GNUNET_YES == - is_excluded_generation (mut->generation, - excluded, - excluded_size)) + is_excluded_generation (mut->generation, excluded, excluded_size)) { /* The generation is excluded (because it belongs to another fork via a lazy copy) and thus mutations aren't considered @@ -387,12 +375,10 @@ is_element_of_generation (struct ElementEntry *ee, } /* This would be an inconsistency in how we manage mutations. */ - if ( (GNUNET_YES == is_present) && - (GNUNET_YES == mut->added) ) + if ((GNUNET_YES == is_present) && (GNUNET_YES == mut->added)) GNUNET_assert (0); /* Likewise. */ - if ( (GNUNET_NO == is_present) && - (GNUNET_NO == mut->added) ) + if ((GNUNET_NO == is_present) && (GNUNET_NO == mut->added)) GNUNET_assert (0); is_present = mut->added; @@ -410,8 +396,7 @@ is_element_of_generation (struct ElementEntry *ee, * @return #GNUNET_YES if the element is in the set, #GNUNET_NO if not */ int -_GSS_is_element_of_operation (struct ElementEntry *ee, - struct Operation *op) +_GSS_is_element_of_operation (struct ElementEntry *ee, struct Operation *op) { return is_element_of_generation (ee, op->generation_created, @@ -434,15 +419,12 @@ _GSS_is_element_of_operation (struct ElementEntry *ee, * @param gc #GNUNET_YES to perform garbage collection on the set */ void -_GSS_operation_destroy (struct Operation *op, - int gc) +_GSS_operation_destroy (struct Operation *op, int gc) { struct Set *set = op->set; struct GNUNET_CADET_Channel *channel; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Destroying operation %p\n", - op); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying operation %p\n", op); GNUNET_assert (NULL == op->listener); if (NULL != op->state) { @@ -451,9 +433,7 @@ _GSS_operation_destroy (struct Operation *op, } if (NULL != set) { - GNUNET_CONTAINER_DLL_remove (set->ops_head, - set->ops_tail, - op); + GNUNET_CONTAINER_DLL_remove (set->ops_head, set->ops_tail, op); op->set = NULL; } if (NULL != op->context_msg) @@ -468,8 +448,7 @@ _GSS_operation_destroy (struct Operation *op, op->channel = NULL; GNUNET_CADET_channel_destroy (channel); } - if ( (NULL != set) && - (GNUNET_YES == gc) ) + if ((NULL != set) && (GNUNET_YES == gc)) collect_generation_garbage (set); /* We rely on the channel end handler to free 'op'. When 'op->channel' was NULL, * there was a channel end handler that will free 'op' on the call stack. */ @@ -486,8 +465,8 @@ _GSS_operation_destroy (struct Operation *op, */ static void * client_connect_cb (void *cls, - struct GNUNET_SERVICE_Client *c, - struct GNUNET_MQ_Handle *mq) + struct GNUNET_SERVICE_Client *c, + struct GNUNET_MQ_Handle *mq) { struct ClientState *cs; @@ -537,8 +516,7 @@ client_disconnect_cb (void *cls, struct Listener *listener; struct Set *set; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Client disconnected, cleaning up\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client disconnected, cleaning up\n"); if (NULL != (set = cs->set)) { struct SetContent *content = set->content; @@ -546,12 +524,10 @@ client_disconnect_cb (void *cls, struct PendingMutation *pm_current; struct LazyCopyRequest *lcr; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Destroying client's set\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying client's set\n"); /* Destroy pending set operations */ while (NULL != set->ops_head) - _GSS_operation_destroy (set->ops_head, - GNUNET_NO); + _GSS_operation_destroy (set->ops_head, GNUNET_NO); /* Destroy operation-specific state */ GNUNET_assert (NULL != set->state); @@ -618,8 +594,7 @@ client_disconnect_cb (void *cls, if (NULL != (listener = cs->listener)) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Destroying client's listener\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Destroying client's listener\n"); GNUNET_CADET_close_port (listener->open_port); listener->open_port = NULL; while (NULL != (op = listener->op_head)) @@ -630,15 +605,12 @@ client_disconnect_cb (void *cls, GNUNET_i2s (&op->peer)); incoming_destroy (op); } - GNUNET_CONTAINER_DLL_remove (listener_head, - listener_tail, - listener); + GNUNET_CONTAINER_DLL_remove (listener_head, listener_tail, listener); GNUNET_free (listener); } GNUNET_free (cs); num_clients--; - if ( (GNUNET_YES == in_shutdown) && - (0 == num_clients) ) + if ((GNUNET_YES == in_shutdown) && (0 == num_clients)) { if (NULL != cadet) { @@ -658,8 +630,7 @@ client_disconnect_cb (void *cls, * #GNUNET_SYSERR to destroy the channel */ static int -check_incoming_msg (void *cls, - const struct OperationRequestMessage *msg) +check_incoming_msg (void *cls, const struct OperationRequestMessage *msg) { struct Operation *op = cls; struct Listener *listener = op->listener; @@ -677,14 +648,15 @@ check_incoming_msg (void *cls, GNUNET_break (0); return GNUNET_SYSERR; } - if (listener->operation != (enum GNUNET_SET_OperationType) ntohl (msg->operation)) + if (listener->operation != + (enum GNUNET_SET_OperationType) ntohl (msg->operation)) { GNUNET_break_op (0); return GNUNET_SYSERR; } nested_context = GNUNET_MQ_extract_nested_mh (msg); - if ( (NULL != nested_context) && - (ntohs (nested_context->size) > GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE) ) + if ((NULL != nested_context) && + (ntohs (nested_context->size) > GNUNET_SET_CONTEXT_MESSAGE_MAX_SIZE)) { GNUNET_break_op (0); return GNUNET_SYSERR; @@ -711,8 +683,7 @@ check_incoming_msg (void *cls, * #GNUNET_SYSERR to destroy the channel */ static void -handle_incoming_msg (void *cls, - const struct OperationRequestMessage *msg) +handle_incoming_msg (void *cls, const struct OperationRequestMessage *msg) { struct Operation *op = cls; struct Listener *listener = op->listener; @@ -727,10 +698,11 @@ handle_incoming_msg (void *cls, if (NULL != nested_context) op->context_msg = GNUNET_copy_message (nested_context); op->remote_element_count = ntohl (msg->element_count); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received P2P operation request (op %u, port %s) for active listener\n", - (uint32_t) ntohl (msg->operation), - GNUNET_h2s (&op->listener->app_id)); + GNUNET_log ( + GNUNET_ERROR_TYPE_DEBUG, + "Received P2P operation request (op %u, port %s) for active listener\n", + (uint32_t) ntohl (msg->operation), + GNUNET_h2s (&op->listener->app_id)); GNUNET_assert (0 == op->suggest_id); if (0 == suggest_id) suggest_id++; @@ -741,17 +713,15 @@ handle_incoming_msg (void *cls, env = GNUNET_MQ_msg_nested_mh (cmsg, GNUNET_MESSAGE_TYPE_SET_REQUEST, op->context_msg); - GNUNET_MQ_env_set_options(env, - GNUNET_MQ_PREF_RELIABLE); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Suggesting incoming request with accept id %u to listener %p of client %p\n", - op->suggest_id, - listener, - listener->cs); + GNUNET_log ( + GNUNET_ERROR_TYPE_DEBUG, + "Suggesting incoming request with accept id %u to listener %p of client %p\n", + op->suggest_id, + listener, + listener->cs); cmsg->accept_id = htonl (op->suggest_id); cmsg->peer_id = op->peer; - GNUNET_MQ_send (listener->cs->mq, - env); + GNUNET_MQ_send (listener->cs->mq, env); /* NOTE: GNUNET_CADET_receive_done() will be called in #handle_client_accept() */ } @@ -764,8 +734,7 @@ handle_incoming_msg (void *cls, * @param msg message specifying the change */ static void -execute_add (struct Set *set, - const struct GNUNET_SET_ElementMessage *msg) +execute_add (struct Set *set, const struct GNUNET_SET_ElementMessage *msg) { struct GNUNET_SET_Element el; struct ElementEntry *ee; @@ -775,10 +744,8 @@ execute_add (struct Set *set, el.size = ntohs (msg->header.size) - sizeof (*msg); el.data = &msg[1]; el.element_type = ntohs (msg->element_type); - GNUNET_SET_element_hash (&el, - &hash); - ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements, - &hash); + GNUNET_SET_element_hash (&el, &hash); + ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements, &hash); if (NULL == ee) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -787,9 +754,7 @@ execute_add (struct Set *set, el.size); ee = GNUNET_malloc (el.size + sizeof (*ee)); ee->element.size = el.size; - GNUNET_memcpy (&ee[1], - el.data, - el.size); + GNUNET_memcpy (&ee[1], el.data, el.size); ee->element.data = &ee[1]; ee->element.element_type = el.element_type; ee->remote = GNUNET_NO; @@ -797,10 +762,11 @@ execute_add (struct Set *set, ee->mutations_size = 0; ee->element_hash = hash; GNUNET_break (GNUNET_YES == - GNUNET_CONTAINER_multihashmap_put (set->content->elements, - &ee->element_hash, - ee, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); + GNUNET_CONTAINER_multihashmap_put ( + set->content->elements, + &ee->element_hash, + ee, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); } else if (GNUNET_YES == is_element_of_generation (ee, @@ -818,16 +784,11 @@ execute_add (struct Set *set, } { - struct MutationEvent mut = { - .generation = set->current_generation, - .added = GNUNET_YES - }; - GNUNET_array_append (ee->mutations, - ee->mutations_size, - mut); + struct MutationEvent mut = {.generation = set->current_generation, + .added = GNUNET_YES}; + GNUNET_array_append (ee->mutations, ee->mutations_size, mut); } - set->vt->add (set->state, - ee); + set->vt->add (set->state, ee); } @@ -838,8 +799,7 @@ execute_add (struct Set *set, * @param msg message specifying the change */ static void -execute_remove (struct Set *set, - const struct GNUNET_SET_ElementMessage *msg) +execute_remove (struct Set *set, const struct GNUNET_SET_ElementMessage *msg) { struct GNUNET_SET_Element el; struct ElementEntry *ee; @@ -850,8 +810,7 @@ execute_remove (struct Set *set, el.data = &msg[1]; el.element_type = ntohs (msg->element_type); GNUNET_SET_element_hash (&el, &hash); - ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements, - &hash); + ee = GNUNET_CONTAINER_multihashmap_get (set->content->elements, &hash); if (NULL == ee) { /* Client tried to remove non-existing element. */ @@ -860,11 +819,10 @@ execute_remove (struct Set *set, el.size); return; } - if (GNUNET_NO == - is_element_of_generation (ee, - set->current_generation, - set->excluded_generations, - set->excluded_generations_size)) + if (GNUNET_NO == is_element_of_generation (ee, + set->current_generation, + set->excluded_generations, + set->excluded_generations_size)) { /* Client tried to remove element twice */ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -874,21 +832,16 @@ execute_remove (struct Set *set, } else { - struct MutationEvent mut = { - .generation = set->current_generation, - .added = GNUNET_NO - }; + struct MutationEvent mut = {.generation = set->current_generation, + .added = GNUNET_NO}; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client removes element of size %u\n", el.size); - GNUNET_array_append (ee->mutations, - ee->mutations_size, - mut); + GNUNET_array_append (ee->mutations, ee->mutations_size, mut); } - set->vt->remove (set->state, - ee); + set->vt->remove (set->state, ee); } @@ -899,19 +852,18 @@ execute_remove (struct Set *set, * @param msg specification of what to change */ static void -execute_mutation (struct Set *set, - const struct GNUNET_SET_ElementMessage *msg) +execute_mutation (struct Set *set, const struct GNUNET_SET_ElementMessage *msg) { switch (ntohs (msg->header.type)) { - case GNUNET_MESSAGE_TYPE_SET_ADD: - execute_add (set, msg); - break; - case GNUNET_MESSAGE_TYPE_SET_REMOVE: - execute_remove (set, msg); - break; - default: - GNUNET_break (0); + case GNUNET_MESSAGE_TYPE_SET_ADD: + execute_add (set, msg); + break; + case GNUNET_MESSAGE_TYPE_SET_REMOVE: + execute_remove (set, msg); + break; + default: + GNUNET_break (0); } } @@ -937,8 +889,7 @@ execute_delayed_mutations (struct Set *set) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing pending mutation on %p.\n", pm->set); - execute_mutation (pm->set, - pm->msg); + execute_mutation (pm->set, pm->msg); GNUNET_free (pm->msg); GNUNET_free (pm); } @@ -967,15 +918,14 @@ send_client_element (struct Set *set) struct GNUNET_SET_IterResponseMessage *msg; GNUNET_assert (NULL != set->iter); - do { + do + { ret = GNUNET_CONTAINER_multihashmap_iterator_next (set->iter, NULL, (const void **) &ee); if (GNUNET_NO == ret) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Iteration on %p done.\n", - set); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Iteration on %p done.\n", set); ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_ITER_DONE); GNUNET_CONTAINER_multihashmap_iterator_destroy (set->iter); set->iter = NULL; @@ -983,8 +933,7 @@ send_client_element (struct Set *set) GNUNET_assert (set->content->iterator_count > 0); set->content->iterator_count--; execute_delayed_mutations (set); - GNUNET_MQ_send (set->cs->mq, - ev); + GNUNET_MQ_send (set->cs->mq, ev); return; } GNUNET_assert (NULL != ee); @@ -999,13 +948,10 @@ send_client_element (struct Set *set) ev = GNUNET_MQ_msg_extra (msg, ee->element.size, GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); - GNUNET_memcpy (&msg[1], - ee->element.data, - ee->element.size); + GNUNET_memcpy (&msg[1], ee->element.data, ee->element.size); msg->element_type = htons (ee->element.element_type); msg->iteration_id = htons (set->iteration_id); - GNUNET_MQ_send (set->cs->mq, - ev); + GNUNET_MQ_send (set->cs->mq, ev); } @@ -1019,8 +965,7 @@ send_client_element (struct Set *set) * @param m message sent by the client */ static void -handle_client_iterate (void *cls, - const struct GNUNET_MessageHeader *m) +handle_client_iterate (void *cls, const struct GNUNET_MessageHeader *m) { struct ClientState *cs = cls; struct Set *set; @@ -1046,7 +991,8 @@ handle_client_iterate (void *cls, GNUNET_CONTAINER_multihashmap_size (set->content->elements)); GNUNET_SERVICE_client_continue (cs->client); set->content->iterator_count++; - set->iter = GNUNET_CONTAINER_multihashmap_iterator_create (set->content->elements); + set->iter = + GNUNET_CONTAINER_multihashmap_iterator_create (set->content->elements); set->iter_generation = set->current_generation; send_client_element (set); } @@ -1061,8 +1007,7 @@ handle_client_iterate (void *cls, * @param m message sent by the client */ static void -handle_client_create_set (void *cls, - const struct GNUNET_SET_CreateMessage *msg) +handle_client_create_set (void *cls, const struct GNUNET_SET_CreateMessage *msg) { struct ClientState *cs = cls; struct Set *set; @@ -1103,8 +1048,7 @@ handle_client_create_set (void *cls, } set->content = GNUNET_new (struct SetContent); set->content->refcount = 1; - set->content->elements = GNUNET_CONTAINER_multihashmap_create (1, - GNUNET_YES); + set->content->elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); set->cs = cs; cs->set = set; GNUNET_SERVICE_client_continue (cs->client); @@ -1156,22 +1100,17 @@ channel_new_cb (void *cls, struct Listener *listener = cls; struct Operation *op; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "New incoming channel\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New incoming channel\n"); op = GNUNET_new (struct Operation); op->listener = listener; op->peer = *source; op->channel = channel; op->mq = GNUNET_CADET_get_mq (op->channel); - op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, - UINT32_MAX); - op->timeout_task - = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT, - &incoming_timeout_cb, - op); - GNUNET_CONTAINER_DLL_insert (listener->op_head, - listener->op_tail, - op); + op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); + op->timeout_task = GNUNET_SCHEDULER_add_delayed (INCOMING_CHANNEL_TIMEOUT, + &incoming_timeout_cb, + op); + GNUNET_CONTAINER_DLL_insert (listener->op_head, listener->op_tail, op); return op; } @@ -1193,8 +1132,7 @@ channel_new_cb (void *cls, * @param channel connection to the other end (henceforth invalid) */ static void -channel_end_cb (void *channel_ctx, - const struct GNUNET_CADET_Channel *channel) +channel_end_cb (void *channel_ctx, const struct GNUNET_CADET_Channel *channel) { struct Operation *op = channel_ctx; @@ -1213,8 +1151,7 @@ _GSS_operation_destroy2 (struct Operation *op) { struct GNUNET_CADET_Channel *channel; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "channel_end_cb called\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "channel_end_cb called\n"); if (NULL != (channel = op->channel)) { /* This will free op; called conditionally as this helper function @@ -1230,8 +1167,7 @@ _GSS_operation_destroy2 (struct Operation *op) if (NULL != op->set) op->set->vt->channel_death (op); else - _GSS_operation_destroy (op, - GNUNET_YES); + _GSS_operation_destroy (op, GNUNET_YES); GNUNET_free (op); } @@ -1266,77 +1202,75 @@ channel_window_cb (void *cls, * @param msg message sent by the client */ static void -handle_client_listen (void *cls, - const struct GNUNET_SET_ListenMessage *msg) +handle_client_listen (void *cls, const struct GNUNET_SET_ListenMessage *msg) { struct ClientState *cs = cls; - struct GNUNET_MQ_MessageHandler cadet_handlers[] = { - GNUNET_MQ_hd_var_size (incoming_msg, - GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, - struct OperationRequestMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_ibf, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, - struct IBFMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_elements, - GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, - struct GNUNET_SET_ElementMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_offer, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_inquiry, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY, - struct InquiryMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_demand, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_fixed_size (union_p2p_done, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_fixed_size (union_p2p_over, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_fixed_size (union_p2p_full_done, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_fixed_size (union_p2p_request_full, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, - struct StrataEstimatorMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, - struct StrataEstimatorMessage, - NULL), - GNUNET_MQ_hd_var_size (union_p2p_full_element, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT, - struct GNUNET_SET_ElementMessage, - NULL), - GNUNET_MQ_hd_fixed_size (intersection_p2p_element_info, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, - struct IntersectionElementInfoMessage, - NULL), - GNUNET_MQ_hd_var_size (intersection_p2p_bf, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, - struct BFMessage, - NULL), - GNUNET_MQ_hd_fixed_size (intersection_p2p_done, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, - struct IntersectionDoneMessage, - NULL), - GNUNET_MQ_handler_end () - }; + struct GNUNET_MQ_MessageHandler cadet_handlers[] = + {GNUNET_MQ_hd_var_size (incoming_msg, + GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, + struct OperationRequestMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_ibf, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, + struct IBFMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_elements, + GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, + struct GNUNET_SET_ElementMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_offer, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_inquiry, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY, + struct InquiryMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_demand, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_fixed_size (union_p2p_done, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_fixed_size (union_p2p_over, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_fixed_size (union_p2p_full_done, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_fixed_size (union_p2p_request_full, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, + struct StrataEstimatorMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, + struct StrataEstimatorMessage, + NULL), + GNUNET_MQ_hd_var_size (union_p2p_full_element, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT, + struct GNUNET_SET_ElementMessage, + NULL), + GNUNET_MQ_hd_fixed_size (intersection_p2p_element_info, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, + struct IntersectionElementInfoMessage, + NULL), + GNUNET_MQ_hd_var_size (intersection_p2p_bf, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, + struct BFMessage, + NULL), + GNUNET_MQ_hd_fixed_size (intersection_p2p_done, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, + struct IntersectionDoneMessage, + NULL), + GNUNET_MQ_handler_end ()}; struct Listener *listener; if (NULL != cs->listener) @@ -1351,21 +1285,18 @@ handle_client_listen (void *cls, cs->listener = listener; listener->app_id = msg->app_id; listener->operation = (enum GNUNET_SET_OperationType) ntohl (msg->operation); - GNUNET_CONTAINER_DLL_insert (listener_head, - listener_tail, - listener); + GNUNET_CONTAINER_DLL_insert (listener_head, listener_tail, listener); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "New listener created (op %u, port %s)\n", listener->operation, GNUNET_h2s (&listener->app_id)); - listener->open_port - = GNUNET_CADET_open_port (cadet, - &msg->app_id, - &channel_new_cb, - listener, - &channel_window_cb, - &channel_end_cb, - cadet_handlers); + listener->open_port = GNUNET_CADET_open_port (cadet, + &msg->app_id, + &channel_new_cb, + listener, + &channel_window_cb, + &channel_end_cb, + cadet_handlers); GNUNET_SERVICE_client_continue (cs->client); } @@ -1378,8 +1309,7 @@ handle_client_listen (void *cls, * @param msg message sent by the client */ static void -handle_client_reject (void *cls, - const struct GNUNET_SET_RejectMessage *msg) +handle_client_reject (void *cls, const struct GNUNET_SET_RejectMessage *msg) { struct ClientState *cs = cls; struct Operation *op; @@ -1411,8 +1341,7 @@ handle_client_reject (void *cls, * @param msg message sent by the client */ static int -check_client_mutation (void *cls, - const struct GNUNET_SET_ElementMessage *msg) +check_client_mutation (void *cls, const struct GNUNET_SET_ElementMessage *msg) { /* NOTE: Technically, we should probably check with the block library whether the element we are given is well-formed */ @@ -1427,8 +1356,7 @@ check_client_mutation (void *cls, * @param msg message sent by the client */ static void -handle_client_mutation (void *cls, - const struct GNUNET_SET_ElementMessage *msg) +handle_client_mutation (void *cls, const struct GNUNET_SET_ElementMessage *msg) { struct ClientState *cs = cls; struct Set *set; @@ -1446,20 +1374,18 @@ handle_client_mutation (void *cls, { struct PendingMutation *pm; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Scheduling mutation on set\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Scheduling mutation on set\n"); pm = GNUNET_new (struct PendingMutation); - pm->msg = (struct GNUNET_SET_ElementMessage *) GNUNET_copy_message (&msg->header); + pm->msg = + (struct GNUNET_SET_ElementMessage *) GNUNET_copy_message (&msg->header); pm->set = set; GNUNET_CONTAINER_DLL_insert_tail (set->content->pending_mutations_head, set->content->pending_mutations_tail, pm); return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Executing mutation on set\n"); - execute_mutation (set, - msg); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing mutation on set\n"); + execute_mutation (set, msg); } @@ -1503,8 +1429,7 @@ advance_generation (struct Set *set) * @return #GNUNET_OK if the message is well-formed */ static int -check_client_evaluate (void *cls, - const struct GNUNET_SET_EvaluateMessage *msg) +check_client_evaluate (void *cls, const struct GNUNET_SET_EvaluateMessage *msg) { /* FIXME: suboptimal, even if the context below could be NULL, there are malformed messages this does not check for... */ @@ -1521,78 +1446,76 @@ check_client_evaluate (void *cls, * @param msg message sent by the client */ static void -handle_client_evaluate (void *cls, - const struct GNUNET_SET_EvaluateMessage *msg) +handle_client_evaluate (void *cls, const struct GNUNET_SET_EvaluateMessage *msg) { struct ClientState *cs = cls; struct Operation *op = GNUNET_new (struct Operation); - const struct GNUNET_MQ_MessageHandler cadet_handlers[] = { - GNUNET_MQ_hd_var_size (incoming_msg, - GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, - struct OperationRequestMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_ibf, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, - struct IBFMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_elements, - GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, - struct GNUNET_SET_ElementMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_offer, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_var_size (union_p2p_inquiry, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY, - struct InquiryMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_demand, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_fixed_size (union_p2p_done, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_fixed_size (union_p2p_over, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_fixed_size (union_p2p_full_done, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_fixed_size (union_p2p_request_full, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL, - struct GNUNET_MessageHeader, - op), - GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, - struct StrataEstimatorMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, - struct StrataEstimatorMessage, - op), - GNUNET_MQ_hd_var_size (union_p2p_full_element, - GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT, - struct GNUNET_SET_ElementMessage, - op), - GNUNET_MQ_hd_fixed_size (intersection_p2p_element_info, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, - struct IntersectionElementInfoMessage, - op), - GNUNET_MQ_hd_var_size (intersection_p2p_bf, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, - struct BFMessage, - op), - GNUNET_MQ_hd_fixed_size (intersection_p2p_done, - GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, - struct IntersectionDoneMessage, - op), - GNUNET_MQ_handler_end () - }; + const struct GNUNET_MQ_MessageHandler cadet_handlers[] = + {GNUNET_MQ_hd_var_size (incoming_msg, + GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, + struct OperationRequestMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_ibf, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, + struct IBFMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_elements, + GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, + struct GNUNET_SET_ElementMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_offer, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_var_size (union_p2p_inquiry, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY, + struct InquiryMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_demand, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_fixed_size (union_p2p_done, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_fixed_size (union_p2p_over, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_fixed_size (union_p2p_full_done, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_fixed_size (union_p2p_request_full, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL, + struct GNUNET_MessageHeader, + op), + GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, + struct StrataEstimatorMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, + struct StrataEstimatorMessage, + op), + GNUNET_MQ_hd_var_size (union_p2p_full_element, + GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT, + struct GNUNET_SET_ElementMessage, + op), + GNUNET_MQ_hd_fixed_size (intersection_p2p_element_info, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO, + struct IntersectionElementInfoMessage, + op), + GNUNET_MQ_hd_var_size (intersection_p2p_bf, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF, + struct BFMessage, + op), + GNUNET_MQ_hd_fixed_size (intersection_p2p_done, + GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_DONE, + struct IntersectionDoneMessage, + op), + GNUNET_MQ_handler_end ()}; struct Set *set; const struct GNUNET_MessageHeader *context; @@ -1603,8 +1526,7 @@ handle_client_evaluate (void *cls, GNUNET_SERVICE_client_drop (cs->client); return; } - op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, - UINT32_MAX); + op->salt = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX); op->peer = msg->target_peer; op->result_mode = ntohl (msg->result_mode); op->client_request_id = ntohl (msg->request_id); @@ -1619,9 +1541,7 @@ handle_client_evaluate (void *cls, op->set = set; op->generation_created = set->current_generation; advance_generation (set); - GNUNET_CONTAINER_DLL_insert (set->ops_head, - set->ops_tail, - op); + GNUNET_CONTAINER_DLL_insert (set->ops_head, set->ops_tail, op); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating new CADET channel to port %s for set operation type %u\n", GNUNET_h2s (&msg->app_id), @@ -1634,8 +1554,7 @@ handle_client_evaluate (void *cls, &channel_end_cb, cadet_handlers); op->mq = GNUNET_CADET_get_mq (op->channel); - op->state = set->vt->evaluate (op, - context); + op->state = set->vt->evaluate (op, context); if (NULL == op->state) { GNUNET_break (0); @@ -1655,8 +1574,7 @@ handle_client_evaluate (void *cls, * @param ack the message */ static void -handle_client_iter_ack (void *cls, - const struct GNUNET_SET_IterAckMessage *ack) +handle_client_iter_ack (void *cls, const struct GNUNET_SET_IterAckMessage *ack) { struct ClientState *cs = cls; struct Set *set; @@ -1718,14 +1636,10 @@ handle_client_copy_lazy_prepare (void *cls, cr = GNUNET_new (struct LazyCopyRequest); cr->cookie = ++lazy_copy_cookie; cr->source_set = set; - GNUNET_CONTAINER_DLL_insert (lazy_copy_head, - lazy_copy_tail, - cr); - ev = GNUNET_MQ_msg (resp_msg, - GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_RESPONSE); + GNUNET_CONTAINER_DLL_insert (lazy_copy_head, lazy_copy_tail, cr); + ev = GNUNET_MQ_msg (resp_msg, GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_RESPONSE); resp_msg->cookie = cr->cookie; - GNUNET_MQ_send (set->cs->mq, - ev); + GNUNET_MQ_send (set->cs->mq, ev); GNUNET_SERVICE_client_continue (cs->client); } @@ -1737,8 +1651,9 @@ handle_client_copy_lazy_prepare (void *cls, * @param msg the message */ static void -handle_client_copy_lazy_connect (void *cls, - const struct GNUNET_SET_CopyLazyConnectMessage *msg) +handle_client_copy_lazy_connect ( + void *cls, + const struct GNUNET_SET_CopyLazyConnectMessage *msg) { struct ClientState *cs = cls; struct LazyCopyRequest *cr; @@ -1768,9 +1683,7 @@ handle_client_copy_lazy_connect (void *cls, GNUNET_SERVICE_client_drop (cs->client); return; } - GNUNET_CONTAINER_DLL_remove (lazy_copy_head, - lazy_copy_tail, - cr); + GNUNET_CONTAINER_DLL_remove (lazy_copy_head, lazy_copy_tail, cr); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p requested use of lazy copy\n", cs); @@ -1805,9 +1718,10 @@ handle_client_copy_lazy_connect (void *cls, set->current_generation = cr->source_set->current_generation; set->excluded_generations_size = cr->source_set->excluded_generations_size; - set->excluded_generations - = GNUNET_memdup (cr->source_set->excluded_generations, - set->excluded_generations_size * sizeof (struct GenerationRange)); + set->excluded_generations = + GNUNET_memdup (cr->source_set->excluded_generations, + set->excluded_generations_size * + sizeof (struct GenerationRange)); /* Advance the generation of the new set, so that mutations to the of the cloned set and the source set are independent. */ @@ -1826,8 +1740,7 @@ handle_client_copy_lazy_connect (void *cls, * @param msg the message */ static void -handle_client_cancel (void *cls, - const struct GNUNET_SET_CancelMessage *msg) +handle_client_cancel (void *cls, const struct GNUNET_SET_CancelMessage *msg) { struct ClientState *cs = cls; struct Set *set; @@ -1866,8 +1779,7 @@ handle_client_cancel (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client requested cancel for op %u\n", (uint32_t) ntohl (msg->request_id)); - _GSS_operation_destroy (op, - GNUNET_YES); + _GSS_operation_destroy (op, GNUNET_YES); } GNUNET_SERVICE_client_continue (cs->client); } @@ -1882,8 +1794,7 @@ handle_client_cancel (void *cls, * @param msg the message */ static void -handle_client_accept (void *cls, - const struct GNUNET_SET_AcceptMessage *msg) +handle_client_accept (void *cls, const struct GNUNET_SET_AcceptMessage *msg) { struct ClientState *cs = cls; struct Set *set; @@ -1904,17 +1815,16 @@ handle_client_accept (void *cls, { /* It is not an error if the set op does not exist -- it may * have been destroyed when the partner peer disconnected. */ - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Client %p accepted request %u of listener %p that is no longer active\n", - cs, - ntohl (msg->accept_reject_id), - cs->listener); - ev = GNUNET_MQ_msg (result_message, - GNUNET_MESSAGE_TYPE_SET_RESULT); + GNUNET_log ( + GNUNET_ERROR_TYPE_INFO, + "Client %p accepted request %u of listener %p that is no longer active\n", + cs, + ntohl (msg->accept_reject_id), + cs->listener); + ev = GNUNET_MQ_msg (result_message, GNUNET_MESSAGE_TYPE_SET_RESULT); result_message->request_id = msg->request_id; result_message->result_status = htons (GNUNET_SET_STATUS_FAILURE); - GNUNET_MQ_send (set->cs->mq, - ev); + GNUNET_MQ_send (set->cs->mq, ev); GNUNET_SERVICE_client_continue (cs->client); return; } @@ -1923,13 +1833,9 @@ handle_client_accept (void *cls, (uint32_t) ntohl (msg->accept_reject_id)); listener = op->listener; op->listener = NULL; - GNUNET_CONTAINER_DLL_remove (listener->op_head, - listener->op_tail, - op); + GNUNET_CONTAINER_DLL_remove (listener->op_head, listener->op_tail, op); op->set = set; - GNUNET_CONTAINER_DLL_insert (set->ops_head, - set->ops_tail, - op); + GNUNET_CONTAINER_DLL_insert (set->ops_head, set->ops_tail, op); op->client_request_id = ntohl (msg->request_id); op->result_mode = ntohl (msg->result_mode); op->byzantine = msg->byzantine; @@ -1975,10 +1881,8 @@ shutdown_task (void *cls) cadet = NULL; } } - GNUNET_STATISTICS_destroy (_GSS_statistics, - GNUNET_YES); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "handled shutdown request\n"); + GNUNET_STATISTICS_destroy (_GSS_statistics, GNUNET_YES); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled shutdown request\n"); } @@ -1998,15 +1902,13 @@ run (void *cls, /* FIXME: need to modify SERVICE (!) API to allow us to run a shutdown task *after* clients were forcefully disconnected! */ - GNUNET_SCHEDULER_add_shutdown (&shutdown_task, - NULL); - _GSS_statistics = GNUNET_STATISTICS_create ("set", - cfg); + GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); + _GSS_statistics = GNUNET_STATISTICS_create ("set", cfg); cadet = GNUNET_CADET_connect (cfg); if (NULL == cadet) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Could not connect to CADET service\n")); + _ ("Could not connect to CADET service\n")); GNUNET_SCHEDULER_shutdown (); return; } @@ -2016,62 +1918,62 @@ run (void *cls, /** * Define "main" method using service macro. */ -GNUNET_SERVICE_MAIN -("set", - GNUNET_SERVICE_OPTION_NONE, - &run, - &client_connect_cb, - &client_disconnect_cb, - NULL, - GNUNET_MQ_hd_fixed_size (client_accept, - GNUNET_MESSAGE_TYPE_SET_ACCEPT, - struct GNUNET_SET_AcceptMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_iter_ack, - GNUNET_MESSAGE_TYPE_SET_ITER_ACK, - struct GNUNET_SET_IterAckMessage, - NULL), - GNUNET_MQ_hd_var_size (client_mutation, - GNUNET_MESSAGE_TYPE_SET_ADD, - struct GNUNET_SET_ElementMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_create_set, - GNUNET_MESSAGE_TYPE_SET_CREATE, - struct GNUNET_SET_CreateMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_iterate, - GNUNET_MESSAGE_TYPE_SET_ITER_REQUEST, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_var_size (client_evaluate, - GNUNET_MESSAGE_TYPE_SET_EVALUATE, - struct GNUNET_SET_EvaluateMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_listen, - GNUNET_MESSAGE_TYPE_SET_LISTEN, - struct GNUNET_SET_ListenMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_reject, - GNUNET_MESSAGE_TYPE_SET_REJECT, - struct GNUNET_SET_RejectMessage, - NULL), - GNUNET_MQ_hd_var_size (client_mutation, - GNUNET_MESSAGE_TYPE_SET_REMOVE, - struct GNUNET_SET_ElementMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_cancel, - GNUNET_MESSAGE_TYPE_SET_CANCEL, - struct GNUNET_SET_CancelMessage, - NULL), - GNUNET_MQ_hd_fixed_size (client_copy_lazy_prepare, - GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_PREPARE, - struct GNUNET_MessageHeader, - NULL), - GNUNET_MQ_hd_fixed_size (client_copy_lazy_connect, - GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT, - struct GNUNET_SET_CopyLazyConnectMessage, - NULL), - GNUNET_MQ_handler_end ()); +GNUNET_SERVICE_MAIN ( + "set", + GNUNET_SERVICE_OPTION_NONE, + &run, + &client_connect_cb, + &client_disconnect_cb, + NULL, + GNUNET_MQ_hd_fixed_size (client_accept, + GNUNET_MESSAGE_TYPE_SET_ACCEPT, + struct GNUNET_SET_AcceptMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_iter_ack, + GNUNET_MESSAGE_TYPE_SET_ITER_ACK, + struct GNUNET_SET_IterAckMessage, + NULL), + GNUNET_MQ_hd_var_size (client_mutation, + GNUNET_MESSAGE_TYPE_SET_ADD, + struct GNUNET_SET_ElementMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_create_set, + GNUNET_MESSAGE_TYPE_SET_CREATE, + struct GNUNET_SET_CreateMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_iterate, + GNUNET_MESSAGE_TYPE_SET_ITER_REQUEST, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_var_size (client_evaluate, + GNUNET_MESSAGE_TYPE_SET_EVALUATE, + struct GNUNET_SET_EvaluateMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_listen, + GNUNET_MESSAGE_TYPE_SET_LISTEN, + struct GNUNET_SET_ListenMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_reject, + GNUNET_MESSAGE_TYPE_SET_REJECT, + struct GNUNET_SET_RejectMessage, + NULL), + GNUNET_MQ_hd_var_size (client_mutation, + GNUNET_MESSAGE_TYPE_SET_REMOVE, + struct GNUNET_SET_ElementMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_cancel, + GNUNET_MESSAGE_TYPE_SET_CANCEL, + struct GNUNET_SET_CancelMessage, + NULL), + GNUNET_MQ_hd_fixed_size (client_copy_lazy_prepare, + GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_PREPARE, + struct GNUNET_MessageHeader, + NULL), + GNUNET_MQ_hd_fixed_size (client_copy_lazy_connect, + GNUNET_MESSAGE_TYPE_SET_COPY_LAZY_CONNECT, + struct GNUNET_SET_CopyLazyConnectMessage, + NULL), + GNUNET_MQ_handler_end ()); /* end of gnunet-service-set.c */ -- cgit v1.2.3