diff options
Diffstat (limited to 'src/namestore/test_namestore_api_zone_iteration_stop.c')
-rw-r--r-- | src/namestore/test_namestore_api_zone_iteration_stop.c | 527 |
1 files changed, 263 insertions, 264 deletions
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c index 28f424b23..89007c82c 100644 --- a/src/namestore/test_namestore_api_zone_iteration_stop.c +++ b/src/namestore/test_namestore_api_zone_iteration_stop.c | |||
@@ -11,12 +11,12 @@ | |||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file namestore/test_namestore_api_zone_iteration_stop.c | 21 | * @file namestore/test_namestore_api_zone_iteration_stop.c |
22 | * @brief testcase for zone iteration functionality: stop iterating of zones | 22 | * @brief testcase for zone iteration functionality: stop iterating of zones |
@@ -29,8 +29,8 @@ | |||
29 | 29 | ||
30 | #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT | 30 | #define TEST_RECORD_TYPE GNUNET_DNSPARSER_TYPE_TXT |
31 | 31 | ||
32 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 100) | 32 | #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 100) |
33 | #define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) | 33 | #define WAIT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 2) |
34 | 34 | ||
35 | static struct GNUNET_NAMESTORE_Handle * nsh; | 35 | static struct GNUNET_NAMESTORE_Handle * nsh; |
36 | 36 | ||
@@ -63,257 +63,257 @@ static struct GNUNET_GNSRECORD_Data *s_rd_3; | |||
63 | * @param cls handle to use to re-connect. | 63 | * @param cls handle to use to re-connect. |
64 | */ | 64 | */ |
65 | static void | 65 | static void |
66 | end (void *cls) | 66 | end(void *cls) |
67 | { | 67 | { |
68 | if (NULL != zi) | 68 | if (NULL != zi) |
69 | { | 69 | { |
70 | GNUNET_NAMESTORE_zone_iteration_stop (zi); | 70 | GNUNET_NAMESTORE_zone_iteration_stop(zi); |
71 | zi = NULL; | 71 | zi = NULL; |
72 | } | 72 | } |
73 | if (nsh != NULL) | 73 | if (nsh != NULL) |
74 | { | 74 | { |
75 | GNUNET_NAMESTORE_disconnect (nsh); | 75 | GNUNET_NAMESTORE_disconnect(nsh); |
76 | nsh = NULL; | 76 | nsh = NULL; |
77 | } | 77 | } |
78 | GNUNET_free_non_null (s_name_1); | 78 | GNUNET_free_non_null(s_name_1); |
79 | GNUNET_free_non_null (s_name_2); | 79 | GNUNET_free_non_null(s_name_2); |
80 | GNUNET_free_non_null (s_name_3); | 80 | GNUNET_free_non_null(s_name_3); |
81 | if (s_rd_1 != NULL) | 81 | if (s_rd_1 != NULL) |
82 | { | 82 | { |
83 | GNUNET_free ((void *)s_rd_1->data); | 83 | GNUNET_free((void *)s_rd_1->data); |
84 | GNUNET_free (s_rd_1); | 84 | GNUNET_free(s_rd_1); |
85 | } | 85 | } |
86 | if (s_rd_2 != NULL) | 86 | if (s_rd_2 != NULL) |
87 | { | 87 | { |
88 | GNUNET_free ((void *)s_rd_2->data); | 88 | GNUNET_free((void *)s_rd_2->data); |
89 | GNUNET_free (s_rd_2); | 89 | GNUNET_free(s_rd_2); |
90 | } | 90 | } |
91 | if (s_rd_3 != NULL) | 91 | if (s_rd_3 != NULL) |
92 | { | 92 | { |
93 | GNUNET_free ((void *)s_rd_3->data); | 93 | GNUNET_free((void *)s_rd_3->data); |
94 | GNUNET_free (s_rd_3); | 94 | GNUNET_free(s_rd_3); |
95 | } | 95 | } |
96 | if (privkey != NULL) | 96 | if (privkey != NULL) |
97 | { | 97 | { |
98 | GNUNET_free (privkey); | 98 | GNUNET_free(privkey); |
99 | privkey = NULL; | 99 | privkey = NULL; |
100 | } | 100 | } |
101 | if (privkey2 != NULL) | 101 | if (privkey2 != NULL) |
102 | { | 102 | { |
103 | GNUNET_free (privkey2); | 103 | GNUNET_free(privkey2); |
104 | privkey2 = NULL; | 104 | privkey2 = NULL; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | static void | 109 | static void |
110 | delayed_end (void *cls) | 110 | delayed_end(void *cls) |
111 | { | 111 | { |
112 | GNUNET_SCHEDULER_shutdown (); | 112 | GNUNET_SCHEDULER_shutdown(); |
113 | } | 113 | } |
114 | 114 | ||
115 | 115 | ||
116 | static void | 116 | static void |
117 | fail_cb (void *cls) | 117 | fail_cb(void *cls) |
118 | { | 118 | { |
119 | GNUNET_assert (0); | 119 | GNUNET_assert(0); |
120 | } | 120 | } |
121 | 121 | ||
122 | 122 | ||
123 | static void | 123 | static void |
124 | zone_proc (void *cls, | 124 | zone_proc(void *cls, |
125 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 125 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
126 | const char *label, | 126 | const char *label, |
127 | unsigned int rd_count, | 127 | unsigned int rd_count, |
128 | const struct GNUNET_GNSRECORD_Data *rd) | 128 | const struct GNUNET_GNSRECORD_Data *rd) |
129 | { | 129 | { |
130 | int failed = GNUNET_NO; | 130 | int failed = GNUNET_NO; |
131 | 131 | ||
132 | GNUNET_assert (NULL != zone); | 132 | GNUNET_assert(NULL != zone); |
133 | if (0 == GNUNET_memcmp (zone, privkey)) | 133 | if (0 == GNUNET_memcmp(zone, privkey)) |
134 | { | ||
135 | if (0 == strcmp (label, s_name_1)) | ||
136 | { | 134 | { |
137 | if (rd_count == 1) | 135 | if (0 == strcmp(label, s_name_1)) |
138 | { | ||
139 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1)) | ||
140 | { | 136 | { |
141 | failed = GNUNET_YES; | 137 | if (rd_count == 1) |
142 | GNUNET_break (0); | 138 | { |
139 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_1)) | ||
140 | { | ||
141 | failed = GNUNET_YES; | ||
142 | GNUNET_break(0); | ||
143 | } | ||
144 | } | ||
145 | else | ||
146 | { | ||
147 | failed = GNUNET_YES; | ||
148 | GNUNET_break(0); | ||
149 | } | ||
150 | } | ||
151 | else if (0 == strcmp(label, s_name_2)) | ||
152 | { | ||
153 | if (rd_count == 1) | ||
154 | { | ||
155 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2)) | ||
156 | { | ||
157 | failed = GNUNET_YES; | ||
158 | GNUNET_break(0); | ||
159 | } | ||
160 | } | ||
161 | else | ||
162 | { | ||
163 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
164 | "Received invalid record count\n"); | ||
165 | failed = GNUNET_YES; | ||
166 | GNUNET_break(0); | ||
167 | } | ||
143 | } | 168 | } |
144 | } | ||
145 | else | 169 | else |
146 | { | ||
147 | failed = GNUNET_YES; | ||
148 | GNUNET_break (0); | ||
149 | } | ||
150 | } | ||
151 | else if (0 == strcmp (label, s_name_2)) | ||
152 | { | ||
153 | if (rd_count == 1) | ||
154 | { | ||
155 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_2)) | ||
156 | { | 170 | { |
171 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | ||
172 | "Comparing result failed: got name `%s' for first zone\n", label); | ||
157 | failed = GNUNET_YES; | 173 | failed = GNUNET_YES; |
158 | GNUNET_break (0); | 174 | GNUNET_break(0); |
159 | } | 175 | } |
160 | } | ||
161 | else | ||
162 | { | ||
163 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
164 | "Received invalid record count\n"); | ||
165 | failed = GNUNET_YES; | ||
166 | GNUNET_break (0); | ||
167 | } | ||
168 | } | ||
169 | else | ||
170 | { | ||
171 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
172 | "Comparing result failed: got name `%s' for first zone\n", label); | ||
173 | failed = GNUNET_YES; | ||
174 | GNUNET_break (0); | ||
175 | } | 176 | } |
176 | } | 177 | else if (0 == GNUNET_memcmp(zone, privkey2)) |
177 | else if (0 == GNUNET_memcmp (zone, privkey2)) | ||
178 | { | ||
179 | if (0 == strcmp (label, s_name_3)) | ||
180 | { | 178 | { |
181 | if (rd_count == 1) | 179 | if (0 == strcmp(label, s_name_3)) |
182 | { | ||
183 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3)) | ||
184 | { | 180 | { |
185 | failed = GNUNET_YES; | 181 | if (rd_count == 1) |
186 | GNUNET_break (0); | 182 | { |
183 | if (GNUNET_YES != GNUNET_GNSRECORD_records_cmp(rd, s_rd_3)) | ||
184 | { | ||
185 | failed = GNUNET_YES; | ||
186 | GNUNET_break(0); | ||
187 | } | ||
188 | } | ||
189 | else | ||
190 | { | ||
191 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
192 | "Received invalid record count\n"); | ||
193 | failed = GNUNET_YES; | ||
194 | GNUNET_break(0); | ||
195 | } | ||
187 | } | 196 | } |
188 | } | ||
189 | else | 197 | else |
190 | { | 198 | { |
191 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 199 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
192 | "Received invalid record count\n"); | 200 | "Comparing result failed: got name `%s' for first zone\n", label); |
193 | failed = GNUNET_YES; | 201 | failed = GNUNET_YES; |
194 | GNUNET_break (0); | 202 | GNUNET_break(0); |
195 | } | 203 | } |
196 | } | 204 | } |
197 | else | 205 | else |
198 | { | 206 | { |
199 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 207 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
200 | "Comparing result failed: got name `%s' for first zone\n", label); | 208 | "Received invalid zone\n"); |
201 | failed = GNUNET_YES; | 209 | failed = GNUNET_YES; |
202 | GNUNET_break (0); | 210 | GNUNET_break(0); |
203 | } | 211 | } |
204 | } | ||
205 | else | ||
206 | { | ||
207 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
208 | "Received invalid zone\n"); | ||
209 | failed = GNUNET_YES; | ||
210 | GNUNET_break (0); | ||
211 | } | ||
212 | if (failed == GNUNET_NO) | 212 | if (failed == GNUNET_NO) |
213 | { | ||
214 | if (1 == returned_records) | ||
215 | { | 213 | { |
216 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 214 | if (1 == returned_records) |
217 | "Telling namestore to stop zone iteration\n"); | 215 | { |
218 | GNUNET_NAMESTORE_zone_iteration_stop (zi); | 216 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
219 | zi = NULL; | 217 | "Telling namestore to stop zone iteration\n"); |
220 | res = 0; | 218 | GNUNET_NAMESTORE_zone_iteration_stop(zi); |
221 | GNUNET_SCHEDULER_add_delayed (WAIT, | 219 | zi = NULL; |
222 | &delayed_end, | 220 | res = 0; |
223 | NULL); | 221 | GNUNET_SCHEDULER_add_delayed(WAIT, |
224 | return; | 222 | &delayed_end, |
223 | NULL); | ||
224 | return; | ||
225 | } | ||
226 | returned_records++; | ||
227 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | ||
228 | "Telling namestore to send the next result\n"); | ||
229 | GNUNET_NAMESTORE_zone_iterator_next(zi, | ||
230 | 1); | ||
225 | } | 231 | } |
226 | returned_records ++; | ||
227 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
228 | "Telling namestore to send the next result\n"); | ||
229 | GNUNET_NAMESTORE_zone_iterator_next (zi, | ||
230 | 1); | ||
231 | } | ||
232 | else | 232 | else |
233 | { | 233 | { |
234 | GNUNET_break (0); | 234 | GNUNET_break(0); |
235 | GNUNET_SCHEDULER_shutdown (); | 235 | GNUNET_SCHEDULER_shutdown(); |
236 | } | 236 | } |
237 | } | 237 | } |
238 | 238 | ||
239 | 239 | ||
240 | static void | 240 | static void |
241 | zone_proc_end (void *cls) | 241 | zone_proc_end(void *cls) |
242 | { | 242 | { |
243 | GNUNET_break (1 <= returned_records); | 243 | GNUNET_break(1 <= returned_records); |
244 | if (1 >= returned_records) | 244 | if (1 >= returned_records) |
245 | res = 1; /* Last iteraterator callback, we are done */ | 245 | res = 1; /* Last iteraterator callback, we are done */ |
246 | else | 246 | else |
247 | res = 0; | 247 | res = 0; |
248 | zi = NULL; | 248 | zi = NULL; |
249 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 249 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
250 | "Received last result, iteration done after receing %u results\n", | 250 | "Received last result, iteration done after receing %u results\n", |
251 | returned_records); | 251 | returned_records); |
252 | GNUNET_SCHEDULER_add_now (&end, NULL); | 252 | GNUNET_SCHEDULER_add_now(&end, NULL); |
253 | } | 253 | } |
254 | 254 | ||
255 | 255 | ||
256 | static void | 256 | static void |
257 | put_cont (void *cls, int32_t success, const char *emsg) | 257 | put_cont(void *cls, int32_t success, const char *emsg) |
258 | { | 258 | { |
259 | static int c = 0; | 259 | static int c = 0; |
260 | 260 | ||
261 | if (success == GNUNET_OK) | 261 | if (success == GNUNET_OK) |
262 | { | 262 | { |
263 | c++; | 263 | c++; |
264 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created record %u \n", c); | 264 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Created record %u \n", c); |
265 | } | 265 | } |
266 | else | 266 | else |
267 | { | 267 | { |
268 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", | 268 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to created records: `%s'\n", |
269 | emsg); | 269 | emsg); |
270 | GNUNET_break (0); | 270 | GNUNET_break(0); |
271 | GNUNET_SCHEDULER_shutdown (); | 271 | GNUNET_SCHEDULER_shutdown(); |
272 | return; | 272 | return; |
273 | } | 273 | } |
274 | 274 | ||
275 | if (c == 3) | 275 | if (c == 3) |
276 | { | ||
277 | res = 1; | ||
278 | returned_records = 0; | ||
279 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
280 | "All records created, starting iteration over all zones \n"); | ||
281 | zi = GNUNET_NAMESTORE_zone_iteration_start (nsh, | ||
282 | NULL, | ||
283 | &fail_cb, | ||
284 | NULL, | ||
285 | &zone_proc, | ||
286 | NULL, | ||
287 | &zone_proc_end, | ||
288 | NULL); | ||
289 | if (zi == NULL) | ||
290 | { | 276 | { |
291 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 277 | res = 1; |
292 | "Failed to create zone iterator\n"); | 278 | returned_records = 0; |
293 | GNUNET_break (0); | 279 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
294 | GNUNET_SCHEDULER_shutdown (); | 280 | "All records created, starting iteration over all zones \n"); |
295 | return; | 281 | zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, |
282 | NULL, | ||
283 | &fail_cb, | ||
284 | NULL, | ||
285 | &zone_proc, | ||
286 | NULL, | ||
287 | &zone_proc_end, | ||
288 | NULL); | ||
289 | if (zi == NULL) | ||
290 | { | ||
291 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, | ||
292 | "Failed to create zone iterator\n"); | ||
293 | GNUNET_break(0); | ||
294 | GNUNET_SCHEDULER_shutdown(); | ||
295 | return; | ||
296 | } | ||
296 | } | 297 | } |
297 | } | ||
298 | } | 298 | } |
299 | 299 | ||
300 | 300 | ||
301 | static struct GNUNET_GNSRECORD_Data * | 301 | static struct GNUNET_GNSRECORD_Data * |
302 | create_record (unsigned int count) | 302 | create_record(unsigned int count) |
303 | { | 303 | { |
304 | struct GNUNET_GNSRECORD_Data *rd; | 304 | struct GNUNET_GNSRECORD_Data *rd; |
305 | 305 | ||
306 | rd = GNUNET_new_array (count, | 306 | rd = GNUNET_new_array(count, |
307 | struct GNUNET_GNSRECORD_Data); | 307 | struct GNUNET_GNSRECORD_Data); |
308 | for (unsigned int c = 0; c < count; c++) | 308 | for (unsigned int c = 0; c < count; c++) |
309 | { | 309 | { |
310 | rd[c].expiration_time = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS).abs_value_us; | 310 | rd[c].expiration_time = GNUNET_TIME_relative_to_absolute(GNUNET_TIME_UNIT_HOURS).abs_value_us; |
311 | rd[c].record_type = TEST_RECORD_TYPE; | 311 | rd[c].record_type = TEST_RECORD_TYPE; |
312 | rd[c].data_size = 50; | 312 | rd[c].data_size = 50; |
313 | rd[c].data = GNUNET_malloc(50); | 313 | rd[c].data = GNUNET_malloc(50); |
314 | rd[c].flags = 0; | 314 | rd[c].flags = 0; |
315 | memset ((char *) rd[c].data, 'a', 50); | 315 | memset((char *)rd[c].data, 'a', 50); |
316 | } | 316 | } |
317 | return rd; | 317 | return rd; |
318 | } | 318 | } |
319 | 319 | ||
@@ -324,86 +324,85 @@ create_record (unsigned int count) | |||
324 | * start the actual tests by filling the zone. | 324 | * start the actual tests by filling the zone. |
325 | */ | 325 | */ |
326 | static void | 326 | static void |
327 | empty_zone_proc (void *cls, | 327 | empty_zone_proc(void *cls, |
328 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 328 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
329 | const char *label, | 329 | const char *label, |
330 | unsigned int rd_count, | 330 | unsigned int rd_count, |
331 | const struct GNUNET_GNSRECORD_Data *rd) | 331 | const struct GNUNET_GNSRECORD_Data *rd) |
332 | { | 332 | { |
333 | 333 | GNUNET_assert(nsh == cls); | |
334 | GNUNET_assert (nsh == cls); | ||
335 | if (NULL != zone) | 334 | if (NULL != zone) |
336 | { | 335 | { |
337 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 336 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
338 | _("Expected empty zone but received zone private key\n")); | 337 | _("Expected empty zone but received zone private key\n")); |
339 | GNUNET_break (0); | 338 | GNUNET_break(0); |
340 | GNUNET_SCHEDULER_shutdown (); | 339 | GNUNET_SCHEDULER_shutdown(); |
341 | return; | 340 | return; |
342 | } | 341 | } |
343 | if ((NULL != label) || (NULL != rd) || (0 != rd_count)) | 342 | if ((NULL != label) || (NULL != rd) || (0 != rd_count)) |
344 | { | 343 | { |
345 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 344 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
346 | _("Expected no zone content but received data\n")); | 345 | _("Expected no zone content but received data\n")); |
347 | GNUNET_break (0); | 346 | GNUNET_break(0); |
348 | GNUNET_SCHEDULER_shutdown (); | 347 | GNUNET_SCHEDULER_shutdown(); |
349 | return; | 348 | return; |
350 | } | 349 | } |
351 | GNUNET_assert (0); | 350 | GNUNET_assert(0); |
352 | } | 351 | } |
353 | 352 | ||
354 | 353 | ||
355 | static void | 354 | static void |
356 | empty_zone_proc_end (void *cls) | 355 | empty_zone_proc_end(void *cls) |
357 | { | 356 | { |
358 | char *hostkey_file; | 357 | char *hostkey_file; |
359 | 358 | ||
360 | GNUNET_assert (nsh == cls); | 359 | GNUNET_assert(nsh == cls); |
361 | zi = NULL; | 360 | zi = NULL; |
362 | GNUNET_asprintf(&hostkey_file, | 361 | GNUNET_asprintf(&hostkey_file, |
363 | "zonefiles%s%s", | 362 | "zonefiles%s%s", |
364 | DIR_SEPARATOR_STR, | 363 | DIR_SEPARATOR_STR, |
365 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); | 364 | "N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey"); |
366 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 365 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
367 | "Using zonekey file `%s' \n", | 366 | "Using zonekey file `%s' \n", |
368 | hostkey_file); | 367 | hostkey_file); |
369 | privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); | 368 | privkey = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
370 | GNUNET_free (hostkey_file); | 369 | GNUNET_free(hostkey_file); |
371 | GNUNET_assert (privkey != NULL); | 370 | GNUNET_assert(privkey != NULL); |
372 | 371 | ||
373 | GNUNET_asprintf (&hostkey_file, | 372 | GNUNET_asprintf(&hostkey_file, |
374 | "zonefiles%s%s", | 373 | "zonefiles%s%s", |
375 | DIR_SEPARATOR_STR, | 374 | DIR_SEPARATOR_STR, |
376 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); | 375 | "HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"); |
377 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 376 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
378 | "Using zonekey file `%s'\n", | 377 | "Using zonekey file `%s'\n", |
379 | hostkey_file); | 378 | hostkey_file); |
380 | privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); | 379 | privkey2 = GNUNET_CRYPTO_ecdsa_key_create_from_file(hostkey_file); |
381 | GNUNET_free (hostkey_file); | 380 | GNUNET_free(hostkey_file); |
382 | GNUNET_assert (privkey2 != NULL); | 381 | GNUNET_assert(privkey2 != NULL); |
383 | 382 | ||
384 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 383 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
385 | "Created record 1\n"); | 384 | "Created record 1\n"); |
386 | 385 | ||
387 | GNUNET_asprintf(&s_name_1, | 386 | GNUNET_asprintf(&s_name_1, |
388 | "dummy1"); | 387 | "dummy1"); |
389 | s_rd_1 = create_record(1); | 388 | s_rd_1 = create_record(1); |
390 | GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1, | 389 | GNUNET_NAMESTORE_records_store(nsh, privkey, s_name_1, |
391 | 1, s_rd_1, &put_cont, NULL); | 390 | 1, s_rd_1, &put_cont, NULL); |
392 | 391 | ||
393 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 392 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
394 | "Created record 2 \n"); | 393 | "Created record 2 \n"); |
395 | GNUNET_asprintf(&s_name_2, | 394 | GNUNET_asprintf(&s_name_2, |
396 | "dummy2"); | 395 | "dummy2"); |
397 | s_rd_2 = create_record(1); | 396 | s_rd_2 = create_record(1); |
398 | GNUNET_NAMESTORE_records_store (nsh, | 397 | GNUNET_NAMESTORE_records_store(nsh, |
399 | privkey, | 398 | privkey, |
400 | s_name_2, | 399 | s_name_2, |
401 | 1, | 400 | 1, |
402 | s_rd_2, | 401 | s_rd_2, |
403 | &put_cont, NULL); | 402 | &put_cont, NULL); |
404 | 403 | ||
405 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 404 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
406 | "Created record 3\n"); | 405 | "Created record 3\n"); |
407 | 406 | ||
408 | /* name in different zone */ | 407 | /* name in different zone */ |
409 | GNUNET_asprintf(&s_name_3, "dummy3"); | 408 | GNUNET_asprintf(&s_name_3, "dummy3"); |
@@ -418,30 +417,30 @@ empty_zone_proc_end (void *cls) | |||
418 | 417 | ||
419 | 418 | ||
420 | static void | 419 | static void |
421 | run (void *cls, | 420 | run(void *cls, |
422 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 421 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
423 | struct GNUNET_TESTING_Peer *peer) | 422 | struct GNUNET_TESTING_Peer *peer) |
424 | { | 423 | { |
425 | nsh = GNUNET_NAMESTORE_connect (cfg); | 424 | nsh = GNUNET_NAMESTORE_connect(cfg); |
426 | GNUNET_break (NULL != nsh); | 425 | GNUNET_break(NULL != nsh); |
427 | GNUNET_SCHEDULER_add_shutdown (&end, | 426 | GNUNET_SCHEDULER_add_shutdown(&end, |
428 | NULL); | 427 | NULL); |
429 | /* first, iterate over empty namestore */ | 428 | /* first, iterate over empty namestore */ |
430 | zi = GNUNET_NAMESTORE_zone_iteration_start (nsh, | 429 | zi = GNUNET_NAMESTORE_zone_iteration_start(nsh, |
431 | NULL, | 430 | NULL, |
432 | &fail_cb, | 431 | &fail_cb, |
433 | NULL, | 432 | NULL, |
434 | &empty_zone_proc, | 433 | &empty_zone_proc, |
435 | nsh, | 434 | nsh, |
436 | &empty_zone_proc_end, | 435 | &empty_zone_proc_end, |
437 | nsh); | 436 | nsh); |
438 | if (NULL == zi) | 437 | if (NULL == zi) |
439 | { | 438 | { |
440 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 439 | GNUNET_log(GNUNET_ERROR_TYPE_ERROR, |
441 | "Failed to create zone iterator\n"); | 440 | "Failed to create zone iterator\n"); |
442 | GNUNET_break (0); | 441 | GNUNET_break(0); |
443 | GNUNET_SCHEDULER_shutdown (); | 442 | GNUNET_SCHEDULER_shutdown(); |
444 | } | 443 | } |
445 | } | 444 | } |
446 | 445 | ||
447 | 446 | ||
@@ -449,24 +448,24 @@ run (void *cls, | |||
449 | 448 | ||
450 | 449 | ||
451 | int | 450 | int |
452 | main (int argc, char *argv[]) | 451 | main(int argc, char *argv[]) |
453 | { | 452 | { |
454 | const char *plugin_name; | 453 | const char *plugin_name; |
455 | char *cfg_name; | 454 | char *cfg_name; |
456 | 455 | ||
457 | SETUP_CFG (plugin_name, cfg_name); | 456 | SETUP_CFG(plugin_name, cfg_name); |
458 | res = 1; | 457 | res = 1; |
459 | if (0 != | 458 | if (0 != |
460 | GNUNET_TESTING_peer_run ("test-namestore-api-zone-iteration-stop", | 459 | GNUNET_TESTING_peer_run("test-namestore-api-zone-iteration-stop", |
461 | cfg_name, | 460 | cfg_name, |
462 | &run, | 461 | &run, |
463 | NULL)) | 462 | NULL)) |
464 | { | 463 | { |
465 | res = 1; | 464 | res = 1; |
466 | } | 465 | } |
467 | GNUNET_DISK_purge_cfg_dir (cfg_name, | 466 | GNUNET_DISK_purge_cfg_dir(cfg_name, |
468 | "GNUNET_TEST_HOME"); | 467 | "GNUNET_TEST_HOME"); |
469 | GNUNET_free (cfg_name); | 468 | GNUNET_free(cfg_name); |
470 | 469 | ||
471 | return res; | 470 | return res; |
472 | } | 471 | } |