From 47c52147dac6bc423b43aa8e2721585df893440b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 27 Nov 2014 10:04:14 +0000 Subject: [PATCH 1/1] rename element's type field to 'element_type' --- src/consensus/consensus_api.c | 5 +++-- src/consensus/gnunet-service-consensus.c | 17 ++++++++++------- src/dv/gnunet-service-dv.c | 2 +- src/include/gnunet_set_service.h | 2 +- src/revocation/gnunet-service-revocation.c | 8 ++++---- .../gnunet-service-scalarproduct.c | 4 ++-- .../gnunet-service-secretsharing.c | 2 +- src/set/gnunet-service-set.c | 2 +- src/set/gnunet-service-set_intersection.c | 4 ++-- src/set/gnunet-service-set_union.c | 4 ++-- src/set/gnunet-set-profiler.c | 13 ++++++++----- src/set/set_api.c | 12 ++++++------ src/set/test_set_api.c | 6 +++--- src/set/test_set_intersection_result_full.c | 6 +++--- src/set/test_set_union_result_full.c | 6 +++--- 15 files changed, 50 insertions(+), 43 deletions(-) diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 6988c7b6d..7b52c2041 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c @@ -116,9 +116,10 @@ handle_new_element (void *cls, = (const struct GNUNET_CONSENSUS_ElementMessage *) mh; struct GNUNET_SET_Element element; - LOG (GNUNET_ERROR_TYPE_DEBUG, "received new element\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "received new element\n"); - element.type = msg->element_type; + element.element_type = msg->element_type; element.size = ntohs (msg->header.size) - sizeof (struct GNUNET_CONSENSUS_ElementMessage); element.data = &msg[1]; diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c index adf81ac17..2659b939d 100644 --- a/src/consensus/gnunet-service-consensus.c +++ b/src/consensus/gnunet-service-consensus.c @@ -377,12 +377,12 @@ destroy_session (struct ConsensusSession *session) /** - * Iterator for set elements. + * Iterator for set elements. [FIXME: bad comment] * * @param cls closure * @param element the current element, NULL if all elements have been * iterated over - * @return GNUNET_YES to continue iterating, GNUNET_NO to stop. + * @return #GNUNET_YES to continue iterating, #GNUNET_NO to stop. */ static int send_to_client_iter (void *cls, @@ -395,17 +395,20 @@ send_to_client_iter (void *cls, { struct GNUNET_CONSENSUS_ElementMessage *m; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: got element for client\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "P%d: got element for client\n", session->local_peer_idx); - ev = GNUNET_MQ_msg_extra (m, element->size, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT); - m->element_type = htons (element->type); + ev = GNUNET_MQ_msg_extra (m, element->size, + GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_RECEIVED_ELEMENT); + m->element_type = htons (element->element_type); memcpy (&m[1], element->data, element->size); GNUNET_MQ_send (session->client_mq, ev); } else { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%d: finished iterating elements for client\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "P%d: finished iterating elements for client\n", session->local_peer_idx); ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE_DONE); GNUNET_MQ_send (session->client_mq, ev); @@ -1252,7 +1255,7 @@ client_insert (void *cls, } element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size); - element->type = msg->element_type; + element->element_type = msg->element_type; element->size = element_size; memcpy (&element[1], &msg[1], element_size); element->data = &element[1]; diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index ad00264d0..478c0cc12 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -852,7 +852,7 @@ build_set (void *cls) target = &route->target; GNUNET_assert (ntohl (target->distance) < DEFAULT_FISHEYE_DEPTH); element.size = sizeof (struct Target); - element.type = htons (0); /* do we need this? */ + element.element_type = htons (0); element.data = target; /* Find next non-NULL entry */ diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index 1ff8d85d5..c0e65cb72 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h @@ -161,7 +161,7 @@ struct GNUNET_SET_Element /** * Application-specific element type. */ - uint16_t type; + uint16_t element_type; /** * Actual data of the element diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 0c75c14c3..7ef5cbc81 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c @@ -268,8 +268,8 @@ publicize_rm (const struct RevokeMessage *rm) GNUNET_CONTAINER_multihashmap_contains (revocation_map, &hc)) { - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Duplicate revocation received from peer. Ignored.\n")); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Duplicate revocation received from peer. Ignored.\n"); return GNUNET_OK; } if (GNUNET_OK != @@ -304,7 +304,7 @@ publicize_rm (const struct RevokeMessage *rm) GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); /* add to set for future connections */ e.size = htons (rm->header.size); - e.type = 0; + e.element_type = 0; e.data = rm; if (GNUNET_OK != GNUNET_SET_add_element (revocation_set, @@ -413,7 +413,7 @@ add_revocation (void *cls, GNUNET_break_op (0); return; } - if (0 != element->type) + if (0 != element->element_type) { GNUNET_STATISTICS_update (stats, "# unsupported revocations received via set union", diff --git a/src/scalarproduct/gnunet-service-scalarproduct.c b/src/scalarproduct/gnunet-service-scalarproduct.c index 07eb565fb..170bf89a6 100644 --- a/src/scalarproduct/gnunet-service-scalarproduct.c +++ b/src/scalarproduct/gnunet-service-scalarproduct.c @@ -1699,7 +1699,7 @@ handle_client_message_multipart (void *cls, } set_elem.data = &elem->key; set_elem.size = sizeof (elem->key); - set_elem.type = 0; /* do we REALLY need this? */ + set_elem.element_type = 0; /* do we REALLY need this? */ GNUNET_SET_add_element (s->intersection_set, &set_elem, NULL, NULL); s->used_element_count++; } @@ -1812,7 +1812,7 @@ handle_client_message (void *cls, } set_elem.data = &elem->key; set_elem.size = sizeof (elem->key); - set_elem.type = 0; /* do we REALLY need this? */ + set_elem.element_type = 0; GNUNET_SET_add_element (s->intersection_set, &set_elem, NULL, NULL); s->used_element_count++; } diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c index ebf078982..3a0461008 100644 --- a/src/secretsharing/gnunet-service-secretsharing.c +++ b/src/secretsharing/gnunet-service-secretsharing.c @@ -2028,7 +2028,7 @@ insert_decrypt_element (struct DecryptSession *ds) element.data = (void *) &d; element.size = sizeof (struct GNUNET_SECRETSHARING_DecryptData); - element.type = 0; + element.element_type = 0; d.ciphertext = ds->ciphertext; d.peer = my_peer; diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 452ded8a3..b050cb465 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -694,7 +694,7 @@ send_client_element (struct Set *set) ee->element.size, GNUNET_MESSAGE_TYPE_SET_ITER_ELEMENT); memcpy (&msg[1], ee->element.data, ee->element.size); - msg->element_type = ee->element.type; + msg->element_type = ee->element.element_type; } GNUNET_MQ_send (set->client_mq, ev); } diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index 606776154..4a252f4be 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c @@ -181,7 +181,7 @@ send_client_element (struct Operation *op, } rm->result_status = htons (GNUNET_SET_STATUS_OK); rm->request_id = htonl (op->spec->client_request_id); - rm->element_type = element->type; + rm->element_type = element->element_type; memcpy (&rm[1], element->data, element->size); GNUNET_MQ_send (op->spec->set->client_mq, ev); } @@ -572,7 +572,7 @@ send_remaining_elements (void *cls) rm->result_status = htons (GNUNET_SET_STATUS_OK); rm->request_id = htonl (op->spec->client_request_id); - rm->element_type = element->type; + rm->element_type = element->element_type; memcpy (&rm[1], element->data, element->size); GNUNET_MQ_notify_sent (ev, send_remaining_elements, op); diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c index 77e8502d6..10ad1c545 100644 --- a/src/set/gnunet-service-set_union.c +++ b/src/set/gnunet-service-set_union.c @@ -965,7 +965,7 @@ send_client_element (struct Operation *op, } rm->result_status = htons (GNUNET_SET_STATUS_OK); rm->request_id = htonl (op->spec->client_request_id); - rm->element_type = element->type; + rm->element_type = element->element_type; memcpy (&rm[1], element->data, element->size); GNUNET_MQ_send (op->spec->set->client_mq, ev); } @@ -1036,7 +1036,7 @@ send_remaining_elements (void *cls) } rm->result_status = htons (GNUNET_SET_STATUS_OK); rm->request_id = htonl (op->spec->client_request_id); - rm->element_type = element->type; + rm->element_type = element->element_type; memcpy (&rm[1], element->data, element->size); if (ke->next_colliding == NULL) { diff --git a/src/set/gnunet-set-profiler.c b/src/set/gnunet-set-profiler.c index f1b7b4b14..3bff45254 100644 --- a/src/set/gnunet-set-profiler.c +++ b/src/set/gnunet-set-profiler.c @@ -143,18 +143,19 @@ set_listen_cb (void *cls, { if (NULL == request) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "listener failed\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "listener failed\n"); return; } GNUNET_assert (NULL == info2.oh); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set listen cb called\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "set listen cb called\n"); info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED, set_result_cb, &info2); GNUNET_SET_commit (info2.oh, info2.set); } - static int set_insert_iterator (void *cls, const struct GNUNET_HashCode *key, @@ -163,8 +164,9 @@ set_insert_iterator (void *cls, struct GNUNET_SET_Handle *set = cls; struct GNUNET_SET_Element *el; - el = GNUNET_malloc (sizeof *el + sizeof *key); - el->type = 0; + el = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + + sizeof (struct GNUNET_HashCode)); + el->element_type = 0; memcpy (&el[1], key, sizeof *key); el->data = &el[1]; el->size = sizeof *key; @@ -205,6 +207,7 @@ handle_shutdown (void *cls, } } + static void run (void *cls, char *const *args, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) diff --git a/src/set/set_api.c b/src/set/set_api.c index 10421ebda..1ef0cc50c 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c @@ -234,7 +234,7 @@ handle_iter_element (void *cls, const struct GNUNET_MessageHeader *mh) return; element.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_IterResponseMessage); - element.type = htons (msg->element_type); + element.element_type = htons (msg->element_type); element.data = &msg[1]; set->iterator (set->iterator_cls, &element); ev = GNUNET_MQ_msg (ack_msg, GNUNET_MESSAGE_TYPE_SET_ITER_ACK); @@ -306,7 +306,7 @@ handle_result (void *cls, const struct GNUNET_MessageHeader *mh) e.data = &msg[1]; e.size = ntohs (mh->size) - sizeof (struct GNUNET_SET_ResultMessage); - e.type = msg->element_type; + e.element_type = msg->element_type; if (NULL != oh->result_cb) oh->result_cb (oh->result_cls, &e, result_status); } @@ -552,7 +552,7 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set, } mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_ADD); - msg->element_type = element->type; + msg->element_type = element->element_type; memcpy (&msg[1], element->data, element->size); GNUNET_MQ_notify_sent (mqm, cont, cont_cls); GNUNET_MQ_send (set->mq, mqm); @@ -569,8 +569,8 @@ GNUNET_SET_add_element (struct GNUNET_SET_Handle *set, * @param set set to remove element from * @param element element to remove from the set * @param cont continuation called after the element has been removed - * @param cont_cls closure for cont - * @return GNUNET_OK on success, GNUNET_SYSERR if the + * @param cont_cls closure for @a cont + * @return #GNUNET_OK on success, #GNUNET_SYSERR if the * set is invalid (e.g. the set service crashed) */ int @@ -590,7 +590,7 @@ GNUNET_SET_remove_element (struct GNUNET_SET_Handle *set, } mqm = GNUNET_MQ_msg_extra (msg, element->size, GNUNET_MESSAGE_TYPE_SET_REMOVE); - msg->element_type = element->type; + msg->element_type = element->element_type; memcpy (&msg[1], element->data, element->size); GNUNET_MQ_notify_sent (mqm, cont, cont_cls); GNUNET_MQ_send (set->mq, mqm); diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c index 63188eb60..37645cbd8 100644 --- a/src/set/test_set_api.c +++ b/src/set/test_set_api.c @@ -149,7 +149,7 @@ init_set2 (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); @@ -171,7 +171,7 @@ init_set1 (void) { struct GNUNET_SET_Element element; - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); @@ -208,7 +208,7 @@ test_iter () iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); diff --git a/src/set/test_set_intersection_result_full.c b/src/set/test_set_intersection_result_full.c index 3b4591bed..567a2ed0d 100644 --- a/src/set/test_set_intersection_result_full.c +++ b/src/set/test_set_intersection_result_full.c @@ -152,7 +152,7 @@ init_set2 (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); GNUNET_SET_add_element (set2, &element, NULL, NULL); @@ -173,7 +173,7 @@ init_set1 (void) { struct GNUNET_SET_Element element; - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); GNUNET_SET_add_element (set1, &element, NULL, NULL); @@ -205,7 +205,7 @@ test_iter () struct GNUNET_SET_Handle *iter_set; iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_INTERSECTION); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); GNUNET_SET_add_element (iter_set, &element, NULL, NULL); diff --git a/src/set/test_set_union_result_full.c b/src/set/test_set_union_result_full.c index 1ed7c7bee..f3f389dd0 100644 --- a/src/set/test_set_union_result_full.c +++ b/src/set/test_set_union_result_full.c @@ -150,7 +150,7 @@ init_set2 (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n"); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); @@ -172,7 +172,7 @@ init_set1 (void) { struct GNUNET_SET_Element element; - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); @@ -209,7 +209,7 @@ test_iter () iter_set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION); - element.type = 0; + element.element_type = 0; element.data = "hello"; element.size = strlen(element.data); -- 2.25.1