aboutsummaryrefslogtreecommitdiff
path: root/src/testbed
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
committerlurchi <lurchi@strangeplace.net>2017-12-30 20:46:59 +0100
commit5c8feda7faa01365a1fb6983595ceb65dfe4fb11 (patch)
tree3521d1131a2f3d063455a58c86c42af3c7551077 /src/testbed
parentd01f1bd83384cbdb74fa963526d31270bf58c805 (diff)
parent8412625bb5191040389610364167c768bb55efb4 (diff)
downloadgnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.tar.gz
gnunet-5c8feda7faa01365a1fb6983595ceb65dfe4fb11.zip
Merge branch 'fix_social'
Diffstat (limited to 'src/testbed')
-rw-r--r--src/testbed/gnunet-helper-testbed.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 392f257dd..9601e7567 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -292,8 +292,9 @@ child_death_task (void *cls)
292 * 292 *
293 * @param cls identification of the client 293 * @param cls identification of the client
294 * @param message the actual message 294 * @param message the actual message
295 * 295 * @return #GNUNET_OK on success,
296 * @return #GNUNET_OK on success, #GNUNET_SYSERR to stop further processing 296 * #GNUNET_NO to stop further processing (no error)
297 * #GNUNET_SYSERR to stop further processing with error
297 */ 298 */
298static int 299static int
299tokenizer_cb (void *cls, 300tokenizer_cb (void *cls,
@@ -359,7 +360,7 @@ tokenizer_cb (void *cls,
359 cfg = GNUNET_CONFIGURATION_create (); 360 cfg = GNUNET_CONFIGURATION_create ();
360 if (GNUNET_OK != 361 if (GNUNET_OK !=
361 GNUNET_CONFIGURATION_deserialize (cfg, 362 GNUNET_CONFIGURATION_deserialize (cfg,
362 config, 363 config,
363 ul_config_size, 364 ul_config_size,
364 NULL)) 365 NULL))
365 { 366 {