3 files changed, 275 insertions, 3 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index b6e42276e..39be05223 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -15,7 +15,8 @@ pkgcfg_DATA = \
   testbed.conf
 
 bin_PROGRAMS = \
-  gnunet-service-testbed
+  gnunet-service-testbed \
+  gnunet-testbed-helper
 
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
@@ -27,12 +28,21 @@ gnunet_service_testbed_LDADD = $(XLIB) \
 gnunet_service_testbed_DEPENDENCIES = \
   libgnunettestbed.la
 
+gnunet_testbed_helper_SOURCES = \
+  gnunet-testbed-helper.c
+gnunet_testbed_helper_LDADD = $(XLIB) \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(LTLIBINTL) -lz
+gnunet_testbed_helper_DEPENDENCIES = \
+  gnunet-service-testbed.$(OBJEXT)
+
 lib_LTLIBRARIES = \
   libgnunettestbed.la
 
 libgnunettestbed_la_SOURCES = \
-  testbed_api.c testbed.h \
-  testbed_api_hosts.c testbed_api_hosts.h \
+  testbed_api.c testbed_api.h testbed.h \
+  testbed_api_hosts.c testbed_api_hosts.h testbed_helper.h \
   testbed_api_operations.c testbed_api_operations.h \
   testbed_api_peers.c testbed_api_peers.h \
   testbed_api_services.c \
diff --git a/src/testbed/gnunet-testbed-helper.c b/src/testbed/gnunet-testbed-helper.c
new file mode 100644
index 000000000..0b590daa1
--- /dev/null
+++ b/src/testbed/gnunet-testbed-helper.c
@@ -0,0 +1,207 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 3, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file testbed/gnunet-testbed-helper.c
+ * @brief Helper binary that is started from a remote controller to start
+ *          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 hurdels. This binary also kills the testbed service
+ *          should the connection from the remote controller is dropped
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ */
+
+
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
+
+#include "testbed_helper.h"
+
+
+/**
+ * Generic debug logging shortcut
+ */
+#define LOG_DEBUG(...)                                  \
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, __VA_ARGS__)
+
+
+/**
+ * Handle to the testing system
+ */
+static struct GNUNET_TESTING_System *test_system;
+
+/**
+ * Our message stream tokenizer
+ */
+struct GNUNET_SERVER_MessageStreamTokenizer *tokenizer;
+
+/**
+ * Disk handle from stdin
+ */
+static struct GNUNET_DISK_FileHandle *stdin_fd;
+
+/**
+ * Message receive buffer
+ */
+static void *buf;
+
+/**
+ * The size of the above buffer
+ */
+static size_t buf_size;
+
+/**
+ * Task identifier for the read task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier read_task_id;
+
+/**
+ * Task identifier for the shutdown task
+ */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task_id;
+
+/**
+ * Task to shutting down nicely
+ *
+ * @param cls NULL
+ * @return tc the task context
+ */
+static void
+shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (GNUNET_SCHEDULER_NO_TASK != read_task_id)
+    GNUNET_SCHEDULER_cancel (read_task_id);
+  (void) GNUNET_DISK_file_close (stdin_fd);
+  GNUNET_free_non_null (buf);  
+  GNUNET_SERVER_mst_destroy (tokenizer);  
+  if (NULL != test_system)
+    GNUNET_TESTING_system_destroy (test_system, GNUNET_YES);
+}
+
+
+/**
+ * Functions with this signature are called whenever a
+ * complete message is received by the tokenizer.
+ *
+ * Do not call GNUNET_SERVER_mst_destroy in callback
+ *
+ * @param cls closure
+ * @param client identification of the client
+ * @param message the actual message
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
+ */
+static int 
+tokenizer_cb (void *cls, void *client,
+              const struct GNUNET_MessageHeader *message)
+{
+  GNUNET_break (0);
+  return GNUNET_OK;
+}
+
+
+/**
+ * Task to read from stdin
+ *
+ * @param cls NULL
+ * @return tc the task context
+ */
+static void
+read_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  ssize_t sread;
+  static int ignore_reading = GNUNET_NO;
+  int ret;
+
+  read_task_id = GNUNET_SCHEDULER_NO_TASK;
+  if (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)
+    return;  
+  sread = GNUNET_DISK_file_read (stdin_fd, buf, buf_size);
+  if (GNUNET_SYSERR == sread)
+  {
+    GNUNET_break (0);           /* FIXME: stdin closed - kill child */
+    GNUNET_SCHEDULER_cancel (shutdown_task_id);
+    shutdown_task_id = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
+    return;
+  }
+  LOG_DEBUG ("Read %u bytes\n", sread);
+  read_task_id =                /* No timeout while reading */
+    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    stdin_fd, &read_task, NULL);
+  if (GNUNET_YES == ignore_reading)
+    return;
+  ret = GNUNET_SERVER_mst_receive (tokenizer, NULL, buf, sread,
+                                   GNUNET_YES, GNUNET_YES);
+  GNUNET_assert (GNUNET_SYSERR != ret);
+  if (GNUNET_NO == ret)
+  {
+    LOG_DEBUG ("We only listen for 1 message -- ignoring others\n");
+    ignore_reading = GNUNET_YES;
+  }
+}
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be NULL!)
+ * @param cfg configuration
+ */
+static void 
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle * cfg)
+{
+  tokenizer = GNUNET_SERVER_mst_create (&tokenizer_cb, NULL);
+  stdin_fd = GNUNET_DISK_get_handle_from_native (stdin);
+  buf_size = sizeof (struct GNUNET_TESTBED_HelperInit) + 8 * 1024;
+  buf = GNUNET_malloc (buf_size);
+  read_task_id =                /* No timeout while reading */
+    GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
+                                    stdin_fd, &read_task, NULL);
+  shutdown_task_id = 
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                  &shutdown_task, NULL);
+}
+
+
+/**
+ * Main function
+ *
+ * @param argc the number of command line arguments
+ * @param argv command line arg array
+ * @return return code
+ */
+int main (int argc, char **argv)
+{
+   struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+   if (GNUNET_OK != 
+       GNUNET_PROGRAM_run ( argc, argv, "gnunet-testbed-helper",
+                            "Helper for starting gnunet-service-testbed",
+                            options, &run, NULL))
+     return 1;
+  else return 0;
+}
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
new file mode 100644
index 000000000..f4f8abd39
--- /dev/null
+++ b/src/testbed/testbed_helper.h
@@ -0,0 +1,55 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 3, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file testbed/testbed_helper.c
+ * @brief Message formats for communication between testbed api and
+ *          gnunet-testbed-helper process
+ * @author Sree Harsha Totakura <sreeharsha@totakura.in> 
+ */
+
+#ifndef TESTBED_HELPER_H
+#define TESTBED_HELPER_H
+
+struct GNUNET_TESTBED_HelperInit
+{
+  /**
+   * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * The controller hostname size excluding the NULL termination character -
+   * strlen (hostname); cannot be zero 
+   */
+  uint16_t cname_size GNUNET_PACKED;
+
+  /**
+   * The sizeof the configuration following
+   */
+  uint16_t config_size GNUNET_PACKED;
+
+  /* Followed by NULL terminated controller hostname */
+  
+  /* Followed by serialized and compressed configuration which should be
+     config_size long */
+};
+
+#endif