removing remenants of abstract unix domain socket handling, this finishes addressing...

[oweals/gnunet.git] / src / testbed / gnunet-helper-testbed.c

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 88ef3f87da48e9ec0265808d9aa5d88d8faee2aa..f49789a80fdbf9f14938471768604aeb10552726 100644 (file)
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -24,8 +24,8 @@
  *          gnunet-service-testbed. This binary also receives configuration
  *          from the remove controller which is put in a temporary location
  *          with ports and paths fixed so that gnunet-service-testbed runs
- *          without any hurdles.  
- * 
+ *          without any hurdles.
+ *
  *          This helper monitors for three termination events.  They are: (1)The
  *          stdin of the helper is closed for reading; (2)the helper received
  *          SIGTERM/SIGINT; (3)the testbed crashed.  In case of events 1 and 2
@@ -161,13 +161,13 @@ static int status;
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  LOG_DEBUG ("Shutting down\n");  
+  LOG_DEBUG ("Shutting down\n");
   shutdown_task_id = GNUNET_SCHEDULER_NO_TASK;
   if (NULL != testbed)
   {
     LOG_DEBUG ("Killing testbed\n");
     GNUNET_break (0 == GNUNET_OS_process_kill (testbed, SIGTERM));
-  }  
+  }
   if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
   {
     GNUNET_SCHEDULER_cancel (read_task_id);
@@ -194,7 +194,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (testbed));
     GNUNET_OS_process_destroy (testbed);
     testbed = NULL;
-  }  
+  }
   if (NULL != test_system)
   {
     GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
@@ -291,7 +291,7 @@ child_death_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_break (0);
     return;
   }
-  GNUNET_break (GNUNET_SYSERR != 
+  GNUNET_break (GNUNET_SYSERR !=
                 (ret = GNUNET_OS_process_status (testbed, &type, &code)));
   if (GNUNET_NO != ret)
   {
@@ -337,6 +337,7 @@ tokenizer_cb (void *cls, void *client,
   char *hostname;
   char *config;
   char *xconfig;
+  char *evstr;
   size_t config_size;
   uLongf ul_config_size;
   size_t xconfig_size;
@@ -422,7 +423,8 @@ tokenizer_cb (void *cls, void *client,
   LOG_DEBUG ("Staring testbed with config: %s\n", config);
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-testbed");
   /* expose testbed configuration through env variable */
-  GNUNET_assert (0 == setenv (ENV_TESTBED_CONFIG, config, 1));
+  GNUNET_assert (0 < GNUNET_asprintf (&evstr, "%s=%s", ENV_TESTBED_CONFIG, config));
+  GNUNET_assert (0 == putenv (evstr)); /* Do NOT free evstr; it is consumed by putenv */
   testbed =
       GNUNET_OS_start_process (PIPE_CONTROL,
                                GNUNET_OS_INHERIT_STD_ERR /*verbose? */ , NULL,
@@ -454,7 +456,7 @@ tokenizer_cb (void *cls, void *client,
   wc->data = reply;
   write_task_id =
       GNUNET_SCHEDULER_add_write_file (GNUNET_TIME_UNIT_FOREVER_REL, stdout_fd,
-                                       &write_task, wc);  
+                                       &write_task, wc);
   child_death_task_id =
       GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
                                       GNUNET_DISK_pipe_handle (sigpipe,
@@ -532,7 +534,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   read_task_id =
       GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL, stdin_fd,
                                       &read_task, NULL);
-  shutdown_task_id = 
+  shutdown_task_id =
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                     NULL);
 }
@@ -574,7 +576,7 @@ main (int argc, char **argv)
   int ret;
 
   status = GNUNET_OK;
-  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, 
+  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
                                            GNUNET_NO, GNUNET_NO)))
   {
     GNUNET_break (0);