diff options
| author | Julius Bünger <buenger@mytum.de> | 2019-04-18 10:56:46 +0200 |
|---|---|---|
| committer | Julius Bünger <buenger@mytum.de> | 2019-04-18 10:56:46 +0200 |
| commit | 6006418909cef503a9e026fde4a9f7d4862d2c01 (patch) | |
| tree | 7afb4f08971d8e22425613de9e4a52275945c1d8 | |
| parent | 689458cd3f23833a8c26b2bb8161be773b5075e4 (diff) | |
TNG testing: Specify config source differently
| -rw-r--r-- | src/transport/test_communicator_unix.c | 2 | ||||
| -rw-r--r-- | src/transport/transport-testing2.c | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/transport/test_communicator_unix.c b/src/transport/test_communicator_unix.c index f94587a12..ef7ed32c0 100644 --- a/src/transport/test_communicator_unix.c +++ b/src/transport/test_communicator_unix.c @@ -60,7 +60,7 @@ run (void *cls) GNUNET_TRANSPORT_TESTING_transport_communicator_service_start ( "transport", - cfg, + "test_communicator_1.conf", &communicator_available, NULL); /* cls */ } diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 0a7aa1da0..dbbc94c7f 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c @@ -220,14 +220,25 @@ communicator_start (const char *cfgname) struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle * GNUNET_TRANSPORT_TESTING_transport_communicator_service_start (const char *service_name, - struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_CONFIGURATION_Handle *cfg_filename, GNUNET_TRANSPORT_TESTING_CommunicatorAvailableCallback communicator_available, //GNUNET_TRANSPORT_TESTING_Callback2 cb2, //GNUNET_TRANSPORT_TESTING_Callback3 cb3, //GNUNET_TRANSPORT_TESTING_Callback4 cb4, void *cb_cls) { + struct GNUNET_CONFIGURATION_Handle *cfg; + cfg = GNUNET_CONFIGURATION_create (); + if ( (GNUNET_SYSERR == + GNUNET_CONFIGURATION_load (cfg, + cfg_filename)) ) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Malformed configuration file `%s', exit ...\n"), + cfg_filename); + return NULL; + } /* Start communicator part of service */ transport_communicator_start (communicator_available, cfg); |