diff options
Diffstat (limited to 'src/messenger/test_messenger_anonymous.c')
-rw-r--r-- | src/messenger/test_messenger_anonymous.c | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/messenger/test_messenger_anonymous.c b/src/messenger/test_messenger_anonymous.c index e2057acc4..a70121a30 100644 --- a/src/messenger/test_messenger_anonymous.c +++ b/src/messenger/test_messenger_anonymous.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2020 GNUnet e.V. | 3 | Copyright (C) 2020--2021 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
@@ -59,14 +59,13 @@ end (void *cls) | |||
59 | 59 | ||
60 | if (messenger) | 60 | if (messenger) |
61 | { | 61 | { |
62 | GNUNET_MESSENGER_disconnect(messenger); | 62 | GNUNET_MESSENGER_disconnect (messenger); |
63 | messenger = NULL; | 63 | messenger = NULL; |
64 | } | 64 | } |
65 | 65 | ||
66 | status = 0; | 66 | status = 0; |
67 | } | 67 | } |
68 | 68 | ||
69 | |||
70 | static void | 69 | static void |
71 | end_badly (void *cls) | 70 | end_badly (void *cls) |
72 | { | 71 | { |
@@ -81,7 +80,7 @@ end_operation (void *cls) | |||
81 | { | 80 | { |
82 | op_task = NULL; | 81 | op_task = NULL; |
83 | 82 | ||
84 | fprintf (stderr, "Testcase failed (operation: '%s').\n", cls? (const char*) cls : "unknown"); | 83 | fprintf (stderr, "Testcase failed (operation: '%s').\n", cls ? (const char*) cls : "unknown"); |
85 | 84 | ||
86 | if (die_task) | 85 | if (die_task) |
87 | GNUNET_SCHEDULER_cancel (die_task); | 86 | GNUNET_SCHEDULER_cancel (die_task); |
@@ -105,7 +104,7 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle) | |||
105 | op_task = NULL; | 104 | op_task = NULL; |
106 | } | 105 | } |
107 | 106 | ||
108 | const char* name = GNUNET_MESSENGER_get_name(handle); | 107 | const char *name = GNUNET_MESSENGER_get_name (handle); |
109 | 108 | ||
110 | if (NULL != name) | 109 | if (NULL != name) |
111 | { | 110 | { |
@@ -113,26 +112,21 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle) | |||
113 | return; | 112 | return; |
114 | } | 113 | } |
115 | 114 | ||
116 | if (GNUNET_SYSERR != GNUNET_MESSENGER_update(handle)) | 115 | if (GNUNET_SYSERR != GNUNET_MESSENGER_update (handle)) |
117 | { | 116 | { |
118 | op_task = GNUNET_SCHEDULER_add_now (&end_operation, "update-fail"); | 117 | op_task = GNUNET_SCHEDULER_add_now (&end_operation, "update-fail"); |
119 | return; | 118 | return; |
120 | } | 119 | } |
121 | 120 | ||
122 | struct GNUNET_IDENTITY_Ego* ego = GNUNET_IDENTITY_ego_get_anonymous(); | 121 | const struct GNUNET_IDENTITY_PublicKey *key = GNUNET_MESSENGER_get_key (handle); |
123 | struct GNUNET_IDENTITY_PublicKey anonymous_key; | ||
124 | |||
125 | GNUNET_IDENTITY_ego_get_public_key(ego, &anonymous_key); | ||
126 | |||
127 | const struct GNUNET_IDENTITY_PublicKey* key = GNUNET_MESSENGER_get_key(handle); | ||
128 | 122 | ||
129 | if (0 != GNUNET_memcmp(key, (&anonymous_key))) | 123 | if (key) |
130 | { | 124 | { |
131 | op_task = GNUNET_SCHEDULER_add_now (&end_operation, "key-anonymous"); | 125 | op_task = GNUNET_SCHEDULER_add_now (&end_operation, "key-anonymous"); |
132 | return; | 126 | return; |
133 | } | 127 | } |
134 | 128 | ||
135 | GNUNET_MESSENGER_disconnect(handle); | 129 | GNUNET_MESSENGER_disconnect (handle); |
136 | 130 | ||
137 | messenger = NULL; | 131 | messenger = NULL; |
138 | 132 | ||
@@ -150,14 +144,12 @@ on_identity (void *cls, struct GNUNET_MESSENGER_Handle *handle) | |||
150 | * @param peer Peer for testing | 144 | * @param peer Peer for testing |
151 | */ | 145 | */ |
152 | static void | 146 | static void |
153 | run (void *cls, | 147 | run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) |
154 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
155 | struct GNUNET_TESTING_Peer *peer) | ||
156 | { | 148 | { |
157 | die_task = GNUNET_SCHEDULER_add_delayed (TOTAL_TIMEOUT, &end_badly, NULL); | 149 | die_task = GNUNET_SCHEDULER_add_delayed (TOTAL_TIMEOUT, &end_badly, NULL); |
158 | 150 | ||
159 | op_task = GNUNET_SCHEDULER_add_delayed (BASE_TIMEOUT, &end_operation, "connect"); | 151 | op_task = GNUNET_SCHEDULER_add_delayed (BASE_TIMEOUT, &end_operation, "connect"); |
160 | messenger = GNUNET_MESSENGER_connect(cfg, NULL, &on_identity, NULL, NULL, NULL); | 152 | messenger = GNUNET_MESSENGER_connect (cfg, NULL, &on_identity, NULL, NULL, NULL); |
161 | } | 153 | } |
162 | 154 | ||
163 | /** | 155 | /** |
@@ -168,11 +160,9 @@ run (void *cls, | |||
168 | * @return 0 ok, 1 on error | 160 | * @return 0 ok, 1 on error |
169 | */ | 161 | */ |
170 | int | 162 | int |
171 | main(int argc, char **argv) | 163 | main (int argc, char **argv) |
172 | { | 164 | { |
173 | if (0 != GNUNET_TESTING_peer_run("test-messenger", | 165 | if (0 != GNUNET_TESTING_peer_run ("test-messenger", "test_messenger_api.conf", &run, NULL)) |
174 | "test_messenger_api.conf", | ||
175 | &run, NULL)) | ||
176 | return 1; | 166 | return 1; |
177 | 167 | ||
178 | return status; | 168 | return status; |