diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-08-18 14:42:25 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-08-18 14:42:25 +0200 |
commit | 88f2fcadb2814601dc18a94718f631619d3b21b2 (patch) | |
tree | df6359aaecce13fa0bd5e6ec802d279b8a8ab4bc /src/setu/gnunet-service-setu.c | |
parent | 5570a5d03703c9e864544febe9fbaa6ccfef83ee (diff) | |
download | gnunet-88f2fcadb2814601dc18a94718f631619d3b21b2.tar.gz gnunet-88f2fcadb2814601dc18a94718f631619d3b21b2.zip |
fix message types
Diffstat (limited to 'src/setu/gnunet-service-setu.c')
-rw-r--r-- | src/setu/gnunet-service-setu.c | 73 |
1 files changed, 36 insertions, 37 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c index 88edc622f..d889c1889 100644 --- a/src/setu/gnunet-service-setu.c +++ b/src/setu/gnunet-service-setu.c | |||
@@ -462,7 +462,7 @@ fail_union_operation (struct Operation *op) | |||
462 | 462 | ||
463 | LOG (GNUNET_ERROR_TYPE_WARNING, | 463 | LOG (GNUNET_ERROR_TYPE_WARNING, |
464 | "union operation failed\n"); | 464 | "union operation failed\n"); |
465 | ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_RESULT); | 465 | ev = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SETU_RESULT); |
466 | msg->result_status = htons (GNUNET_SETU_STATUS_FAILURE); | 466 | msg->result_status = htons (GNUNET_SETU_STATUS_FAILURE); |
467 | msg->request_id = htonl (op->client_request_id); | 467 | msg->request_id = htonl (op->client_request_id); |
468 | msg->element_type = htons (0); | 468 | msg->element_type = htons (0); |
@@ -801,7 +801,7 @@ send_ibf (struct Operation *op, | |||
801 | 801 | ||
802 | ev = GNUNET_MQ_msg_extra (msg, | 802 | ev = GNUNET_MQ_msg_extra (msg, |
803 | buckets_in_message * IBF_BUCKET_SIZE, | 803 | buckets_in_message * IBF_BUCKET_SIZE, |
804 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF); | 804 | GNUNET_MESSAGE_TYPE_SETU_P2P_IBF); |
805 | msg->reserved1 = 0; | 805 | msg->reserved1 = 0; |
806 | msg->reserved2 = 0; | 806 | msg->reserved2 = 0; |
807 | msg->order = ibf_order; | 807 | msg->order = ibf_order; |
@@ -872,7 +872,7 @@ send_full_element_iterator (void *cls, | |||
872 | GNUNET_h2s (key)); | 872 | GNUNET_h2s (key)); |
873 | ev = GNUNET_MQ_msg_extra (emsg, | 873 | ev = GNUNET_MQ_msg_extra (emsg, |
874 | el->size, | 874 | el->size, |
875 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT); | 875 | GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_ELEMENT); |
876 | emsg->element_type = htons (el->element_type); | 876 | emsg->element_type = htons (el->element_type); |
877 | GNUNET_memcpy (&emsg[1], | 877 | GNUNET_memcpy (&emsg[1], |
878 | el->data, | 878 | el->data, |
@@ -901,7 +901,7 @@ send_full_set (struct Operation *op) | |||
901 | (void) GNUNET_CONTAINER_multihashmap_iterate (op->set->content->elements, | 901 | (void) GNUNET_CONTAINER_multihashmap_iterate (op->set->content->elements, |
902 | &send_full_element_iterator, | 902 | &send_full_element_iterator, |
903 | op); | 903 | op); |
904 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE); | 904 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_DONE); |
905 | GNUNET_MQ_send (op->mq, | 905 | GNUNET_MQ_send (op->mq, |
906 | ev); | 906 | ev); |
907 | } | 907 | } |
@@ -926,7 +926,7 @@ check_union_p2p_strata_estimator (void *cls, | |||
926 | GNUNET_break (0); | 926 | GNUNET_break (0); |
927 | return GNUNET_SYSERR; | 927 | return GNUNET_SYSERR; |
928 | } | 928 | } |
929 | is_compressed = (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC == htons ( | 929 | is_compressed = (GNUNET_MESSAGE_TYPE_SETU_P2P_SEC == htons ( |
930 | msg->header.type)); | 930 | msg->header.type)); |
931 | len = ntohs (msg->header.size) - sizeof(struct StrataEstimatorMessage); | 931 | len = ntohs (msg->header.size) - sizeof(struct StrataEstimatorMessage); |
932 | if ((GNUNET_NO == is_compressed) && | 932 | if ((GNUNET_NO == is_compressed) && |
@@ -956,7 +956,7 @@ handle_union_p2p_strata_estimator (void *cls, | |||
956 | size_t len; | 956 | size_t len; |
957 | int is_compressed; | 957 | int is_compressed; |
958 | 958 | ||
959 | is_compressed = (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC == htons ( | 959 | is_compressed = (GNUNET_MESSAGE_TYPE_SETU_P2P_SEC == htons ( |
960 | msg->header.type)); | 960 | msg->header.type)); |
961 | GNUNET_STATISTICS_update (_GSS_statistics, | 961 | GNUNET_STATISTICS_update (_GSS_statistics, |
962 | "# bytes of SE received", | 962 | "# bytes of SE received", |
@@ -1045,7 +1045,7 @@ handle_union_p2p_strata_estimator (void *cls, | |||
1045 | "Telling other peer that we expect its full set\n"); | 1045 | "Telling other peer that we expect its full set\n"); |
1046 | op->state->phase = PHASE_EXPECT_IBF; | 1046 | op->state->phase = PHASE_EXPECT_IBF; |
1047 | ev = GNUNET_MQ_msg_header ( | 1047 | ev = GNUNET_MQ_msg_header ( |
1048 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL); | 1048 | GNUNET_MESSAGE_TYPE_SETU_P2P_REQUEST_FULL); |
1049 | GNUNET_MQ_send (op->mq, | 1049 | GNUNET_MQ_send (op->mq, |
1050 | ev); | 1050 | ev); |
1051 | } | 1051 | } |
@@ -1095,7 +1095,7 @@ send_offers_iterator (void *cls, | |||
1095 | 1095 | ||
1096 | ev = GNUNET_MQ_msg_header_extra (mh, | 1096 | ev = GNUNET_MQ_msg_header_extra (mh, |
1097 | sizeof(struct GNUNET_HashCode), | 1097 | sizeof(struct GNUNET_HashCode), |
1098 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER); | 1098 | GNUNET_MESSAGE_TYPE_SETU_P2P_OFFER); |
1099 | 1099 | ||
1100 | GNUNET_assert (NULL != ev); | 1100 | GNUNET_assert (NULL != ev); |
1101 | *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; | 1101 | *(struct GNUNET_HashCode *) &mh[1] = ke->element->element_hash; |
@@ -1246,7 +1246,7 @@ decode_and_send (struct Operation *op) | |||
1246 | 1246 | ||
1247 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1247 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1248 | "transmitted all values, sending DONE\n"); | 1248 | "transmitted all values, sending DONE\n"); |
1249 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE); | 1249 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_DONE); |
1250 | GNUNET_MQ_send (op->mq, ev); | 1250 | GNUNET_MQ_send (op->mq, ev); |
1251 | /* We now wait until we get a DONE message back | 1251 | /* We now wait until we get a DONE message back |
1252 | * and then wait for our MQ to be flushed and all our | 1252 | * and then wait for our MQ to be flushed and all our |
@@ -1272,7 +1272,7 @@ decode_and_send (struct Operation *op) | |||
1272 | * the effort additional complexity. */ | 1272 | * the effort additional complexity. */ |
1273 | ev = GNUNET_MQ_msg_extra (msg, | 1273 | ev = GNUNET_MQ_msg_extra (msg, |
1274 | sizeof(struct IBF_Key), | 1274 | sizeof(struct IBF_Key), |
1275 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY); | 1275 | GNUNET_MESSAGE_TYPE_SETU_P2P_INQUIRY); |
1276 | msg->salt = htonl (op->state->salt_receive); | 1276 | msg->salt = htonl (op->state->salt_receive); |
1277 | GNUNET_memcpy (&msg[1], | 1277 | GNUNET_memcpy (&msg[1], |
1278 | &key, | 1278 | &key, |
@@ -1452,7 +1452,7 @@ send_client_element (struct Operation *op, | |||
1452 | GNUNET_assert (0 != op->client_request_id); | 1452 | GNUNET_assert (0 != op->client_request_id); |
1453 | ev = GNUNET_MQ_msg_extra (rm, | 1453 | ev = GNUNET_MQ_msg_extra (rm, |
1454 | element->size, | 1454 | element->size, |
1455 | GNUNET_MESSAGE_TYPE_SET_RESULT); | 1455 | GNUNET_MESSAGE_TYPE_SETU_RESULT); |
1456 | if (NULL == ev) | 1456 | if (NULL == ev) |
1457 | { | 1457 | { |
1458 | GNUNET_MQ_discard (ev); | 1458 | GNUNET_MQ_discard (ev); |
@@ -1498,7 +1498,7 @@ send_client_done (void *cls) | |||
1498 | "# Union operations failed", | 1498 | "# Union operations failed", |
1499 | 1, | 1499 | 1, |
1500 | GNUNET_NO); | 1500 | GNUNET_NO); |
1501 | ev = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SET_RESULT); | 1501 | ev = GNUNET_MQ_msg (rm, GNUNET_MESSAGE_TYPE_SETU_RESULT); |
1502 | rm->result_status = htons (GNUNET_SETU_STATUS_FAILURE); | 1502 | rm->result_status = htons (GNUNET_SETU_STATUS_FAILURE); |
1503 | rm->request_id = htonl (op->client_request_id); | 1503 | rm->request_id = htonl (op->client_request_id); |
1504 | rm->element_type = htons (0); | 1504 | rm->element_type = htons (0); |
@@ -1516,7 +1516,7 @@ send_client_done (void *cls) | |||
1516 | LOG (GNUNET_ERROR_TYPE_INFO, | 1516 | LOG (GNUNET_ERROR_TYPE_INFO, |
1517 | "Signalling client that union operation is done\n"); | 1517 | "Signalling client that union operation is done\n"); |
1518 | ev = GNUNET_MQ_msg (rm, | 1518 | ev = GNUNET_MQ_msg (rm, |
1519 | GNUNET_MESSAGE_TYPE_SET_RESULT); | 1519 | GNUNET_MESSAGE_TYPE_SETU_RESULT); |
1520 | rm->request_id = htonl (op->client_request_id); | 1520 | rm->request_id = htonl (op->client_request_id); |
1521 | rm->result_status = htons (GNUNET_SETU_STATUS_DONE); | 1521 | rm->result_status = htons (GNUNET_SETU_STATUS_DONE); |
1522 | rm->element_type = htons (0); | 1522 | rm->element_type = htons (0); |
@@ -1550,7 +1550,7 @@ maybe_finish (struct Operation *op) | |||
1550 | struct GNUNET_MQ_Envelope *ev; | 1550 | struct GNUNET_MQ_Envelope *ev; |
1551 | 1551 | ||
1552 | op->state->phase = PHASE_DONE; | 1552 | op->state->phase = PHASE_DONE; |
1553 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE); | 1553 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_DONE); |
1554 | GNUNET_MQ_send (op->mq, | 1554 | GNUNET_MQ_send (op->mq, |
1555 | ev); | 1555 | ev); |
1556 | /* We now wait until the other peer sends P2P_OVER | 1556 | /* We now wait until the other peer sends P2P_OVER |
@@ -1877,7 +1877,7 @@ send_missing_full_elements_iter (void *cls, | |||
1877 | return GNUNET_YES; | 1877 | return GNUNET_YES; |
1878 | ev = GNUNET_MQ_msg_extra (emsg, | 1878 | ev = GNUNET_MQ_msg_extra (emsg, |
1879 | ee->element.size, | 1879 | ee->element.size, |
1880 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT); | 1880 | GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_ELEMENT); |
1881 | GNUNET_memcpy (&emsg[1], | 1881 | GNUNET_memcpy (&emsg[1], |
1882 | ee->element.data, | 1882 | ee->element.data, |
1883 | ee->element.size); | 1883 | ee->element.size); |
@@ -1942,7 +1942,7 @@ handle_union_p2p_full_done (void *cls, | |||
1942 | &send_missing_full_elements_iter, | 1942 | &send_missing_full_elements_iter, |
1943 | op); | 1943 | op); |
1944 | 1944 | ||
1945 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE); | 1945 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_DONE); |
1946 | GNUNET_MQ_send (op->mq, | 1946 | GNUNET_MQ_send (op->mq, |
1947 | ev); | 1947 | ev); |
1948 | op->state->phase = PHASE_DONE; | 1948 | op->state->phase = PHASE_DONE; |
@@ -2044,7 +2044,7 @@ handle_union_p2p_demand (void *cls, | |||
2044 | return; | 2044 | return; |
2045 | } | 2045 | } |
2046 | ev = GNUNET_MQ_msg_extra (emsg, ee->element.size, | 2046 | ev = GNUNET_MQ_msg_extra (emsg, ee->element.size, |
2047 | GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS); | 2047 | GNUNET_MESSAGE_TYPE_SETU_P2P_ELEMENTS); |
2048 | GNUNET_memcpy (&emsg[1], ee->element.data, ee->element.size); | 2048 | GNUNET_memcpy (&emsg[1], ee->element.data, ee->element.size); |
2049 | emsg->reserved = htons (0); | 2049 | emsg->reserved = htons (0); |
2050 | emsg->element_type = htons (ee->element.element_type); | 2050 | emsg->element_type = htons (ee->element.element_type); |
@@ -2148,7 +2148,7 @@ handle_union_p2p_offer (void *cls, | |||
2148 | (void *) op, GNUNET_h2s (hash)); | 2148 | (void *) op, GNUNET_h2s (hash)); |
2149 | ev = GNUNET_MQ_msg_header_extra (demands, | 2149 | ev = GNUNET_MQ_msg_header_extra (demands, |
2150 | sizeof(struct GNUNET_HashCode), | 2150 | sizeof(struct GNUNET_HashCode), |
2151 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND); | 2151 | GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND); |
2152 | GNUNET_memcpy (&demands[1], | 2152 | GNUNET_memcpy (&demands[1], |
2153 | hash, | 2153 | hash, |
2154 | sizeof(struct GNUNET_HashCode)); | 2154 | sizeof(struct GNUNET_HashCode)); |
@@ -2242,7 +2242,7 @@ union_evaluate (struct Operation *op, | |||
2242 | struct OperationRequestMessage *msg; | 2242 | struct OperationRequestMessage *msg; |
2243 | 2243 | ||
2244 | ev = GNUNET_MQ_msg_nested_mh (msg, | 2244 | ev = GNUNET_MQ_msg_nested_mh (msg, |
2245 | GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, | 2245 | GNUNET_MESSAGE_TYPE_SETU_P2P_OPERATION_REQUEST, |
2246 | opaque_context); | 2246 | opaque_context); |
2247 | if (NULL == ev) | 2247 | if (NULL == ev) |
2248 | { | 2248 | { |
@@ -2693,7 +2693,7 @@ handle_client_create_set (void *cls, | |||
2693 | * Timeout happens iff: | 2693 | * Timeout happens iff: |
2694 | * - we suggested an operation to our listener, | 2694 | * - we suggested an operation to our listener, |
2695 | * but did not receive a response in time | 2695 | * but did not receive a response in time |
2696 | * - we got the channel from a peer but no #GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST | 2696 | * - we got the channel from a peer but no #GNUNET_MESSAGE_TYPE_SETU_P2P_OPERATION_REQUEST |
2697 | * | 2697 | * |
2698 | * @param cls channel context | 2698 | * @param cls channel context |
2699 | * @param tc context information (why was this task triggered now) | 2699 | * @param tc context information (why was this task triggered now) |
@@ -3004,7 +3004,6 @@ handle_client_set_add (void *cls, | |||
3004 | } | 3004 | } |
3005 | GNUNET_SERVICE_client_continue (cs->client); | 3005 | GNUNET_SERVICE_client_continue (cs->client); |
3006 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing mutation on set\n"); | 3006 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Executing mutation on set\n"); |
3007 | GNUNET_assert (GNUNET_MESSAGE_TYPE_SET_ADD == ntohs (msg->header.type)); | ||
3008 | el.size = ntohs (msg->header.size) - sizeof(*msg); | 3007 | el.size = ntohs (msg->header.size) - sizeof(*msg); |
3009 | el.data = &msg[1]; | 3008 | el.data = &msg[1]; |
3010 | el.element_type = ntohs (msg->element_type); | 3009 | el.element_type = ntohs (msg->element_type); |
@@ -3096,55 +3095,55 @@ handle_client_evaluate (void *cls, | |||
3096 | struct Operation *op = GNUNET_new (struct Operation); | 3095 | struct Operation *op = GNUNET_new (struct Operation); |
3097 | const struct GNUNET_MQ_MessageHandler cadet_handlers[] = { | 3096 | const struct GNUNET_MQ_MessageHandler cadet_handlers[] = { |
3098 | GNUNET_MQ_hd_var_size (incoming_msg, | 3097 | GNUNET_MQ_hd_var_size (incoming_msg, |
3099 | GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST, | 3098 | GNUNET_MESSAGE_TYPE_SETU_P2P_OPERATION_REQUEST, |
3100 | struct OperationRequestMessage, | 3099 | struct OperationRequestMessage, |
3101 | op), | 3100 | op), |
3102 | GNUNET_MQ_hd_var_size (union_p2p_ibf, | 3101 | GNUNET_MQ_hd_var_size (union_p2p_ibf, |
3103 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_IBF, | 3102 | GNUNET_MESSAGE_TYPE_SETU_P2P_IBF, |
3104 | struct IBFMessage, | 3103 | struct IBFMessage, |
3105 | op), | 3104 | op), |
3106 | GNUNET_MQ_hd_var_size (union_p2p_elements, | 3105 | GNUNET_MQ_hd_var_size (union_p2p_elements, |
3107 | GNUNET_MESSAGE_TYPE_SET_P2P_ELEMENTS, | 3106 | GNUNET_MESSAGE_TYPE_SETU_P2P_ELEMENTS, |
3108 | struct GNUNET_SETU_ElementMessage, | 3107 | struct GNUNET_SETU_ElementMessage, |
3109 | op), | 3108 | op), |
3110 | GNUNET_MQ_hd_var_size (union_p2p_offer, | 3109 | GNUNET_MQ_hd_var_size (union_p2p_offer, |
3111 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OFFER, | 3110 | GNUNET_MESSAGE_TYPE_SETU_P2P_OFFER, |
3112 | struct GNUNET_MessageHeader, | 3111 | struct GNUNET_MessageHeader, |
3113 | op), | 3112 | op), |
3114 | GNUNET_MQ_hd_var_size (union_p2p_inquiry, | 3113 | GNUNET_MQ_hd_var_size (union_p2p_inquiry, |
3115 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_INQUIRY, | 3114 | GNUNET_MESSAGE_TYPE_SETU_P2P_INQUIRY, |
3116 | struct InquiryMessage, | 3115 | struct InquiryMessage, |
3117 | op), | 3116 | op), |
3118 | GNUNET_MQ_hd_var_size (union_p2p_demand, | 3117 | GNUNET_MQ_hd_var_size (union_p2p_demand, |
3119 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DEMAND, | 3118 | GNUNET_MESSAGE_TYPE_SETU_P2P_DEMAND, |
3120 | struct GNUNET_MessageHeader, | 3119 | struct GNUNET_MessageHeader, |
3121 | op), | 3120 | op), |
3122 | GNUNET_MQ_hd_fixed_size (union_p2p_done, | 3121 | GNUNET_MQ_hd_fixed_size (union_p2p_done, |
3123 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_DONE, | 3122 | GNUNET_MESSAGE_TYPE_SETU_P2P_DONE, |
3124 | struct GNUNET_MessageHeader, | 3123 | struct GNUNET_MessageHeader, |
3125 | op), | 3124 | op), |
3126 | GNUNET_MQ_hd_fixed_size (union_p2p_over, | 3125 | GNUNET_MQ_hd_fixed_size (union_p2p_over, |
3127 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_OVER, | 3126 | GNUNET_MESSAGE_TYPE_SETU_P2P_OVER, |
3128 | struct GNUNET_MessageHeader, | 3127 | struct GNUNET_MessageHeader, |
3129 | op), | 3128 | op), |
3130 | GNUNET_MQ_hd_fixed_size (union_p2p_full_done, | 3129 | GNUNET_MQ_hd_fixed_size (union_p2p_full_done, |
3131 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_DONE, | 3130 | GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_DONE, |
3132 | struct GNUNET_MessageHeader, | 3131 | struct GNUNET_MessageHeader, |
3133 | op), | 3132 | op), |
3134 | GNUNET_MQ_hd_fixed_size (union_p2p_request_full, | 3133 | GNUNET_MQ_hd_fixed_size (union_p2p_request_full, |
3135 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_REQUEST_FULL, | 3134 | GNUNET_MESSAGE_TYPE_SETU_P2P_REQUEST_FULL, |
3136 | struct GNUNET_MessageHeader, | 3135 | struct GNUNET_MessageHeader, |
3137 | op), | 3136 | op), |
3138 | GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, | 3137 | GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, |
3139 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE, | 3138 | GNUNET_MESSAGE_TYPE_SETU_P2P_SE, |
3140 | struct StrataEstimatorMessage, | 3139 | struct StrataEstimatorMessage, |
3141 | op), | 3140 | op), |
3142 | GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, | 3141 | GNUNET_MQ_hd_var_size (union_p2p_strata_estimator, |
3143 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC, | 3142 | GNUNET_MESSAGE_TYPE_SETU_P2P_SEC, |
3144 | struct StrataEstimatorMessage, | 3143 | struct StrataEstimatorMessage, |
3145 | op), | 3144 | op), |
3146 | GNUNET_MQ_hd_var_size (union_p2p_full_element, | 3145 | GNUNET_MQ_hd_var_size (union_p2p_full_element, |
3147 | GNUNET_MESSAGE_TYPE_SET_UNION_P2P_FULL_ELEMENT, | 3146 | GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_ELEMENT, |
3148 | struct GNUNET_SETU_ElementMessage, | 3147 | struct GNUNET_SETU_ElementMessage, |
3149 | op), | 3148 | op), |
3150 | GNUNET_MQ_handler_end () | 3149 | GNUNET_MQ_handler_end () |
@@ -3290,7 +3289,7 @@ handle_client_accept (void *cls, | |||
3290 | ntohl (msg->accept_reject_id), | 3289 | ntohl (msg->accept_reject_id), |
3291 | cs->listener); | 3290 | cs->listener); |
3292 | ev = GNUNET_MQ_msg (result_message, | 3291 | ev = GNUNET_MQ_msg (result_message, |
3293 | GNUNET_MESSAGE_TYPE_SET_RESULT); | 3292 | GNUNET_MESSAGE_TYPE_SETU_RESULT); |
3294 | result_message->request_id = msg->request_id; | 3293 | result_message->request_id = msg->request_id; |
3295 | result_message->result_status = htons (GNUNET_SETU_STATUS_FAILURE); | 3294 | result_message->result_status = htons (GNUNET_SETU_STATUS_FAILURE); |
3296 | GNUNET_MQ_send (set->cs->mq, ev); | 3295 | GNUNET_MQ_send (set->cs->mq, ev); |
@@ -3356,9 +3355,9 @@ handle_client_accept (void *cls, | |||
3356 | len = strata_estimator_write (se, | 3355 | len = strata_estimator_write (se, |
3357 | buf); | 3356 | buf); |
3358 | if (len < se->strata_count * IBF_BUCKET_SIZE * se->ibf_size) | 3357 | if (len < se->strata_count * IBF_BUCKET_SIZE * se->ibf_size) |
3359 | type = GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SEC; | 3358 | type = GNUNET_MESSAGE_TYPE_SETU_P2P_SEC; |
3360 | else | 3359 | else |
3361 | type = GNUNET_MESSAGE_TYPE_SET_UNION_P2P_SE; | 3360 | type = GNUNET_MESSAGE_TYPE_SETU_P2P_SE; |
3362 | ev = GNUNET_MQ_msg_extra (strata_msg, | 3361 | ev = GNUNET_MQ_msg_extra (strata_msg, |
3363 | len, | 3362 | len, |
3364 | type); | 3363 | type); |