diff options
| author | Christian Grothoff <christian@grothoff.org> | 2017-06-25 19:36:44 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2017-06-25 19:36:44 +0200 |
| commit | 981cc68a63c71ba11aaca84f559f3cf86a29c0ec (patch) | |
| tree | 5196b264c461b609a128188e78a42b9972c845c3 /src/testbed | |
| parent | 169f1c8c1db0a6d8cebf308ced1de064eadcdc4d (diff) | |
fix configuration parsing issue with inlines from configuration not in cwd
Diffstat (limited to 'src/testbed')
| -rw-r--r-- | src/testbed/gnunet-helper-testbed.c | 5 | ||||
| -rw-r--r-- | src/testbed/testbed_api.c | 5 | ||||
| -rw-r--r-- | src/testbed/testbed_api_hosts.c | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c index d2a3a98b7a..392f257dd9 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c @@ -358,7 +358,10 @@ tokenizer_cb (void *cls, } cfg = GNUNET_CONFIGURATION_create (); if (GNUNET_OK != - GNUNET_CONFIGURATION_deserialize (cfg, config, ul_config_size, GNUNET_NO)) + GNUNET_CONFIGURATION_deserialize (cfg, + config, + ul_config_size, + NULL)) { LOG (GNUNET_ERROR_TYPE_WARNING, "Unable to deserialize config -- exiting\n"); diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 0e0a5da9c9..1acd0e47c9 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c @@ -2158,9 +2158,10 @@ GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg) } cfg = GNUNET_CONFIGURATION_create (); if (GNUNET_OK != - GNUNET_CONFIGURATION_deserialize (cfg, (const char *) data, + GNUNET_CONFIGURATION_deserialize (cfg, + (const char *) data, (size_t) data_len, - GNUNET_NO)) + NULL)) { GNUNET_free (data); GNUNET_break_op (0); /* De-serialization failure */ diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 5d2c1cc377..8efcab6498 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c @@ -983,7 +983,10 @@ helper_mst (void *cls, GNUNET_CONFIGURATION_destroy (cp->host->cfg); cp->host->cfg = GNUNET_CONFIGURATION_create (); GNUNET_assert (GNUNET_CONFIGURATION_deserialize - (cp->host->cfg, config, config_size, GNUNET_NO)); + (cp->host->cfg, + config, + config_size, + NULL)); GNUNET_free (config); if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))) hostname = "localhost"; |