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) | |
download | gnunet-981cc68a63c71ba11aaca84f559f3cf86a29c0ec.tar.gz gnunet-981cc68a63c71ba11aaca84f559f3cf86a29c0ec.zip |
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 d2a3a98b7..392f257dd 100644 --- a/src/testbed/gnunet-helper-testbed.c +++ b/src/testbed/gnunet-helper-testbed.c | |||
@@ -358,7 +358,10 @@ tokenizer_cb (void *cls, | |||
358 | } | 358 | } |
359 | cfg = GNUNET_CONFIGURATION_create (); | 359 | cfg = GNUNET_CONFIGURATION_create (); |
360 | if (GNUNET_OK != | 360 | if (GNUNET_OK != |
361 | GNUNET_CONFIGURATION_deserialize (cfg, config, ul_config_size, GNUNET_NO)) | 361 | GNUNET_CONFIGURATION_deserialize (cfg, |
362 | config, | ||
363 | ul_config_size, | ||
364 | NULL)) | ||
362 | { | 365 | { |
363 | LOG (GNUNET_ERROR_TYPE_WARNING, | 366 | LOG (GNUNET_ERROR_TYPE_WARNING, |
364 | "Unable to deserialize config -- exiting\n"); | 367 | "Unable to deserialize config -- exiting\n"); |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 0e0a5da9c..1acd0e47c 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) | |||
2158 | } | 2158 | } |
2159 | cfg = GNUNET_CONFIGURATION_create (); | 2159 | cfg = GNUNET_CONFIGURATION_create (); |
2160 | if (GNUNET_OK != | 2160 | if (GNUNET_OK != |
2161 | GNUNET_CONFIGURATION_deserialize (cfg, (const char *) data, | 2161 | GNUNET_CONFIGURATION_deserialize (cfg, |
2162 | (const char *) data, | ||
2162 | (size_t) data_len, | 2163 | (size_t) data_len, |
2163 | GNUNET_NO)) | 2164 | NULL)) |
2164 | { | 2165 | { |
2165 | GNUNET_free (data); | 2166 | GNUNET_free (data); |
2166 | GNUNET_break_op (0); /* De-serialization failure */ | 2167 | GNUNET_break_op (0); /* De-serialization failure */ |
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c index 5d2c1cc37..8efcab649 100644 --- a/src/testbed/testbed_api_hosts.c +++ b/src/testbed/testbed_api_hosts.c | |||
@@ -983,7 +983,10 @@ helper_mst (void *cls, | |||
983 | GNUNET_CONFIGURATION_destroy (cp->host->cfg); | 983 | GNUNET_CONFIGURATION_destroy (cp->host->cfg); |
984 | cp->host->cfg = GNUNET_CONFIGURATION_create (); | 984 | cp->host->cfg = GNUNET_CONFIGURATION_create (); |
985 | GNUNET_assert (GNUNET_CONFIGURATION_deserialize | 985 | GNUNET_assert (GNUNET_CONFIGURATION_deserialize |
986 | (cp->host->cfg, config, config_size, GNUNET_NO)); | 986 | (cp->host->cfg, |
987 | config, | ||
988 | config_size, | ||
989 | NULL)); | ||
987 | GNUNET_free (config); | 990 | GNUNET_free (config); |
988 | if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))) | 991 | if (NULL == (hostname = GNUNET_TESTBED_host_get_hostname (cp->host))) |
989 | hostname = "localhost"; | 992 | hostname = "localhost"; |