diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-12-13 22:05:57 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-12-13 22:05:57 +0900 |
commit | 0c9b0159cc1c9aa3464fc41581e4bb53ecc7d1db (patch) | |
tree | c9446e6c971d628442bfeb358fd7c9510edb1324 | |
parent | ba4d141be09651b452270fc21f062d50bd3f738a (diff) | |
download | gnunet-0c9b0159cc1c9aa3464fc41581e4bb53ecc7d1db.tar.gz gnunet-0c9b0159cc1c9aa3464fc41581e4bb53ecc7d1db.zip |
-rename private structs; fix pointer
-rw-r--r-- | src/testing/gnunet-cmds-helper.c | 2 | ||||
-rw-r--r-- | src/testing/testing.h | 4 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_barrier.c | 47 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_netjail_start_testsystem.c | 4 |
4 files changed, 30 insertions, 27 deletions
diff --git a/src/testing/gnunet-cmds-helper.c b/src/testing/gnunet-cmds-helper.c index 22cf5a428..458830cb9 100644 --- a/src/testing/gnunet-cmds-helper.c +++ b/src/testing/gnunet-cmds-helper.c | |||
@@ -416,7 +416,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message) | |||
416 | message->type)) | 416 | message->type)) |
417 | { | 417 | { |
418 | const char *barrier_name; | 418 | const char *barrier_name; |
419 | struct GNUNET_TESTING_CommandBarrierAdvanced *adm = (struct GNUNET_TESTING_CommandBarrierAdvanced *) message; | 419 | struct CommandBarrierAdvanced *adm = (struct CommandBarrierAdvanced *) message; |
420 | 420 | ||
421 | barrier_name = (const char *) &adm[1]; | 421 | barrier_name = (const char *) &adm[1]; |
422 | GNUNET_TESTING_finish_attached_cmds (is, barrier_name); | 422 | GNUNET_TESTING_finish_attached_cmds (is, barrier_name); |
diff --git a/src/testing/testing.h b/src/testing/testing.h index 382879706..7372b143e 100644 --- a/src/testing/testing.h +++ b/src/testing/testing.h | |||
@@ -32,7 +32,7 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
32 | * Message send to a child loop to inform the child loop about a barrier being advanced. | 32 | * Message send to a child loop to inform the child loop about a barrier being advanced. |
33 | * FIXME: This is not packed and contains a char*... no payload documentation. | 33 | * FIXME: This is not packed and contains a char*... no payload documentation. |
34 | */ | 34 | */ |
35 | struct GNUNET_TESTING_CommandBarrierAdvanced | 35 | struct CommandBarrierAdvanced |
36 | { | 36 | { |
37 | /** | 37 | /** |
38 | * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ADVANCED | 38 | * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ADVANCED |
@@ -47,7 +47,7 @@ struct GNUNET_TESTING_CommandBarrierAdvanced | |||
47 | * GNUNET_CMDS_BARRIER_REACHED messages the child will send. | 47 | * GNUNET_CMDS_BARRIER_REACHED messages the child will send. |
48 | * FIXME: Not packed and contains char*; int in NBO? bitlength undefined. | 48 | * FIXME: Not packed and contains char*; int in NBO? bitlength undefined. |
49 | */ | 49 | */ |
50 | struct GNUNET_TESTING_CommandBarrierAttached | 50 | struct CommandBarrierAttached |
51 | { | 51 | { |
52 | /** | 52 | /** |
53 | * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED | 53 | * Type is GNUNET_MESSAGE_TYPE_CMDS_HELPER_BARRIER_ATTACHED |
diff --git a/src/testing/testing_api_cmd_barrier.c b/src/testing/testing_api_cmd_barrier.c index d27ce9d94..7e4e67dea 100644 --- a/src/testing/testing_api_cmd_barrier.c +++ b/src/testing/testing_api_cmd_barrier.c | |||
@@ -37,9 +37,9 @@ struct BarrierState | |||
37 | */ | 37 | */ |
38 | struct GNUNET_TESTING_Barrier *barrier; | 38 | struct GNUNET_TESTING_Barrier *barrier; |
39 | 39 | ||
40 | /* | 40 | /* |
41 | * Our label. | 41 | * Our label. |
42 | */ | 42 | */ |
43 | const char *label; | 43 | const char *label; |
44 | }; | 44 | }; |
45 | 45 | ||
@@ -55,13 +55,15 @@ struct BarrierState | |||
55 | */ | 55 | */ |
56 | void | 56 | void |
57 | GNUNET_TESTING_send_barrier_attach (struct GNUNET_TESTING_Interpreter *is, | 57 | GNUNET_TESTING_send_barrier_attach (struct GNUNET_TESTING_Interpreter *is, |
58 | char *barrier_name, | 58 | char *barrier_name, |
59 | unsigned int global_node_number, | 59 | unsigned int global_node_number, |
60 | unsigned int expected_reaches, | 60 | unsigned int expected_reaches, |
61 | GNUNET_TESTING_cmd_helper_write_cb write_message) | 61 | GNUNET_TESTING_cmd_helper_write_cb |
62 | write_message) | ||
62 | { | 63 | { |
63 | struct GNUNET_TESTING_CommandBarrierAttached *atm = GNUNET_new (struct GNUNET_TESTING_CommandBarrierAttached); | 64 | struct CommandBarrierAttached *atm = GNUNET_new (struct |
64 | size_t msg_length = sizeof(struct GNUNET_TESTING_CommandBarrierAttached); | 65 | CommandBarrierAttached); |
66 | size_t msg_length = sizeof(struct CommandBarrierAttached); | ||
65 | size_t name_len; | 67 | size_t name_len; |
66 | 68 | ||
67 | name_len = strlen (barrier_name) + 1; | 69 | name_len = strlen (barrier_name) + 1; |
@@ -88,8 +90,9 @@ GNUNET_TESTING_send_barrier_advance (struct GNUNET_TESTING_Interpreter *is, | |||
88 | const char *barrier_name, | 90 | const char *barrier_name, |
89 | unsigned int global_node_number) | 91 | unsigned int global_node_number) |
90 | { | 92 | { |
91 | struct GNUNET_TESTING_CommandBarrierAdvanced *adm = GNUNET_new (struct GNUNET_TESTING_CommandBarrierAdvanced); | 93 | struct CommandBarrierAdvanced *adm = GNUNET_new (struct |
92 | size_t msg_length = sizeof(struct GNUNET_TESTING_CommandBarrierAdvanced); | 94 | CommandBarrierAdvanced); |
95 | size_t msg_length = sizeof(struct CommandBarrierAdvanced); | ||
93 | size_t name_len; | 96 | size_t name_len; |
94 | 97 | ||
95 | name_len = strlen (barrier_name) + 1; | 98 | name_len = strlen (barrier_name) + 1; |
@@ -97,8 +100,8 @@ GNUNET_TESTING_send_barrier_advance (struct GNUNET_TESTING_Interpreter *is, | |||
97 | adm->header.size = htons ((uint16_t) msg_length); | 100 | adm->header.size = htons ((uint16_t) msg_length); |
98 | memcpy (&adm[1], barrier_name, name_len); | 101 | memcpy (&adm[1], barrier_name, name_len); |
99 | GNUNET_TESTING_send_message_to_netjail (is, | 102 | GNUNET_TESTING_send_message_to_netjail (is, |
100 | global_node_number, | 103 | global_node_number, |
101 | &adm->header); | 104 | &adm->header); |
102 | GNUNET_free (adm); | 105 | GNUNET_free (adm); |
103 | } | 106 | } |
104 | 107 | ||
@@ -116,7 +119,7 @@ GNUNET_TESTING_can_barrier_advance (struct GNUNET_TESTING_Barrier *barrier) | |||
116 | unsigned int reached = barrier->reached; | 119 | unsigned int reached = barrier->reached; |
117 | double percentage_to_be_reached = barrier->percentage_to_be_reached; | 120 | double percentage_to_be_reached = barrier->percentage_to_be_reached; |
118 | unsigned int number_to_be_reached = barrier->number_to_be_reached; | 121 | unsigned int number_to_be_reached = barrier->number_to_be_reached; |
119 | double percentage_reached = (double)expected_reaches/reached*100; | 122 | double percentage_reached = (double) expected_reaches / reached * 100; |
120 | if (((0 < percentage_to_be_reached) && | 123 | if (((0 < percentage_to_be_reached) && |
121 | (percentage_reached >= percentage_to_be_reached)) || | 124 | (percentage_reached >= percentage_to_be_reached)) || |
122 | ((0 < number_to_be_reached) && (reached >= number_to_be_reached))) | 125 | ((0 < number_to_be_reached) && (reached >= number_to_be_reached))) |
@@ -141,9 +144,9 @@ GNUNET_TESTING_can_barrier_advance (struct GNUNET_TESTING_Barrier *barrier) | |||
141 | */ | 144 | */ |
142 | static enum GNUNET_GenericReturnValue | 145 | static enum GNUNET_GenericReturnValue |
143 | barrier_traits (void *cls, | 146 | barrier_traits (void *cls, |
144 | const void **ret, | 147 | const void **ret, |
145 | const char *trait, | 148 | const char *trait, |
146 | unsigned int index) | 149 | unsigned int index) |
147 | { | 150 | { |
148 | struct GNUNET_TESTING_Trait traits[] = { | 151 | struct GNUNET_TESTING_Trait traits[] = { |
149 | GNUNET_TESTING_trait_end () | 152 | GNUNET_TESTING_trait_end () |
@@ -179,7 +182,7 @@ barrier_cleanup (void *cls) | |||
179 | */ | 182 | */ |
180 | static void | 183 | static void |
181 | barrier_run (void *cls, | 184 | barrier_run (void *cls, |
182 | struct GNUNET_TESTING_Interpreter *is) | 185 | struct GNUNET_TESTING_Interpreter *is) |
183 | { | 186 | { |
184 | struct BarrierState *brs = cls; | 187 | struct BarrierState *brs = cls; |
185 | 188 | ||
@@ -198,20 +201,20 @@ GNUNET_TESTING_barrier_get_node (struct GNUNET_CONTAINER_MultiShortmap *nodes, | |||
198 | unsigned int node_number) | 201 | unsigned int node_number) |
199 | { | 202 | { |
200 | struct GNUNET_HashCode hc; | 203 | struct GNUNET_HashCode hc; |
201 | struct GNUNET_ShortHashCode *key; | 204 | struct GNUNET_ShortHashCode key; |
202 | 205 | ||
203 | GNUNET_CRYPTO_hash (&(node_number), sizeof(node_number), &hc); | 206 | GNUNET_CRYPTO_hash (&(node_number), sizeof(node_number), &hc); |
204 | memcpy (&key, | 207 | memcpy (&key, |
205 | &hc, | 208 | &hc, |
206 | sizeof (key)); | 209 | sizeof (key)); |
207 | return GNUNET_CONTAINER_multishortmap_get (nodes, key); | 210 | return GNUNET_CONTAINER_multishortmap_get (nodes, &key); |
208 | } | 211 | } |
209 | 212 | ||
210 | 213 | ||
211 | struct GNUNET_TESTING_Command | 214 | struct GNUNET_TESTING_Command |
212 | GNUNET_TESTING_cmd_barrier_create (const char *label, | 215 | GNUNET_TESTING_cmd_barrier_create (const char *label, |
213 | double percentage_to_be_reached, | 216 | double percentage_to_be_reached, |
214 | unsigned int number_to_be_reached) | 217 | unsigned int number_to_be_reached) |
215 | { | 218 | { |
216 | struct GNUNET_TESTING_Barrier *barrier; | 219 | struct GNUNET_TESTING_Barrier *barrier; |
217 | struct BarrierState *bs; | 220 | struct BarrierState *bs; |
diff --git a/src/testing/testing_api_cmd_netjail_start_testsystem.c b/src/testing/testing_api_cmd_netjail_start_testsystem.c index 09f767b7a..62b628928 100644 --- a/src/testing/testing_api_cmd_netjail_start_testsystem.c +++ b/src/testing/testing_api_cmd_netjail_start_testsystem.c | |||
@@ -345,14 +345,14 @@ void | |||
345 | barrier_attached (struct NetJailState *ns, const struct | 345 | barrier_attached (struct NetJailState *ns, const struct |
346 | GNUNET_MessageHeader *message) | 346 | GNUNET_MessageHeader *message) |
347 | { | 347 | { |
348 | struct GNUNET_TESTING_CommandBarrierAttached *am; | 348 | struct CommandBarrierAttached *am; |
349 | struct GNUNET_TESTING_NetjailNode *node; | 349 | struct GNUNET_TESTING_NetjailNode *node; |
350 | struct GNUNET_TESTING_Barrier *barrier; | 350 | struct GNUNET_TESTING_Barrier *barrier; |
351 | struct GNUNET_ShortHashCode key; | 351 | struct GNUNET_ShortHashCode key; |
352 | struct GNUNET_HashCode hc; | 352 | struct GNUNET_HashCode hc; |
353 | const char *barrier_name; | 353 | const char *barrier_name; |
354 | 354 | ||
355 | am = (struct GNUNET_TESTING_CommandBarrierAttached *) message; | 355 | am = (struct CommandBarrierAttached *) message; |
356 | barrier_name = (const char *) &am[1]; | 356 | barrier_name = (const char *) &am[1]; |
357 | barrier = GNUNET_TESTING_get_barrier (ns->is, barrier_name); | 357 | barrier = GNUNET_TESTING_get_barrier (ns->is, barrier_name); |
358 | GNUNET_assert (NULL != barrier && GNUNET_NO == barrier->shadow); | 358 | GNUNET_assert (NULL != barrier && GNUNET_NO == barrier->shadow); |