TNG testing: Specify config source differently

diff --git a/src/transport/test_communicator_unix.c b/src/transport/test_communicator_unix.c
index f94587a12ee1956f0cd955c6bc7cbd2357e0fdca..ef7ed32c04406605503a836e596bde2b7f406a82 100644 (file)
--- 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 0a7aa1da052b0924c864eed494c691655e71417f..dbbc94c7f56011b6154d17d821dd6171ed9eaa39 100644 (file)
--- 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);