renamed gnunet-testbed-helper to gnunet-helper-testbed

5 files changed, 31 insertions, 25 deletions

diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 3de2009cc..2e07afee7 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -16,7 +16,7 @@ pkgcfg_DATA = \
 
 bin_PROGRAMS = \
   gnunet-service-testbed \
-  gnunet-testbed-helper
+  gnunet-helper-testbed
 
 gnunet_service_testbed_SOURCES = \
   gnunet-service-testbed.c
@@ -31,14 +31,14 @@ gnunet_service_testbed_LDADD = $(XLIB) \
 gnunet_service_testbed_DEPENDENCIES = \
   libgnunettestbed.la
 
-gnunet_testbed_helper_SOURCES = \
-  gnunet-testbed-helper.c
-gnunet_testbed_helper_LDADD = $(XLIB) \
+gnunet_helper_testbed_SOURCES = \
+  gnunet-helper-testbed.c
+gnunet_helper_testbed_LDADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  libgnunettestbed.la \
  $(LTLIBINTL) -lz
-gnunet_testbed_helper_DEPENDENCIES = \
+gnunet_helper_testbed_DEPENDENCIES = \
   gnunet-service-testbed.$(OBJEXT) \
   libgnunettestbed.la
 
@@ -74,7 +74,7 @@ check_PROGRAMS = \
  test_testbed_api \
  test_testbed_api_operations \
  test_testbed_api_testbed_run \
- test_gnunet_testbed_helper
+ test_gnunet_helper_testbed
 
 if ENABLE_TEST_RUN
  TESTS = \
@@ -82,7 +82,7 @@ if ENABLE_TEST_RUN
   test_testbed_api_hosts \
   test_testbed_api_2peers \
   test_testbed_api_operations \
-  test_gnunet_testbed_helper \
+  test_gnunet_helper_testbed \
   test_testbed_api_controllerlink \
   test_testbed_api_testbed_run
 endif
@@ -126,9 +126,9 @@ test_testbed_api_testbed_run_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la
 
-test_gnunet_testbed_helper_SOURCES = \
- test_gnunet_testbed_helper.c
-test_gnunet_testbed_helper_LDADD = \
+test_gnunet_helper_testbed_SOURCES = \
+ test_gnunet_helper_testbed.c
+test_gnunet_helper_testbed_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la \
  libgnunettestbed.la \
  -lz
\ No newline at end of file
diff --git a/src/testbed/gnunet-testbed-helper.c b/src/testbed/gnunet-helper-testbed.c
index e06472998..bc7f223af 100644
--- a/src/testbed/gnunet-testbed-helper.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testbed/gnunet-testbed-helper.c
+ * @file testbed/gnunet-helper-testbed.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
@@ -435,7 +435,7 @@ main (int argc, char **argv)
   shc_chld =
       GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
   ret =
-      GNUNET_PROGRAM_run (argc, argv, "gnunet-testbed-helper",
+      GNUNET_PROGRAM_run (argc, argv, "gnunet-helper-testbed",
                           "Helper for starting gnunet-service-testbed", options,
                           &run, NULL);
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
@@ -445,4 +445,4 @@ main (int argc, char **argv)
   return (GNUNET_OK == status) ? 0 : 1;
 }
 
-/* end of gnunet-testbed-helper.c */
+/* end of gnunet-helper-testbed.c */
diff --git a/src/testbed/test_gnunet_testbed_helper.c b/src/testbed/test_gnunet_helper_testbed.c
index 92eb07f03..87e39847a 100644
--- a/src/testbed/test_gnunet_testbed_helper.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -19,8 +19,8 @@
  */
 
 /**
- * @file testbed/test_gnunet_testbed_helper.c
- * @brief Testcase for testing gnunet-testbed-helper.c
+ * @file testbed/test_gnunet_helper_testbed.c
+ * @brief Testcase for testing gnunet-helper-testbed.c
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
@@ -202,13 +202,13 @@ run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg2)
 {
   static char *const binary_argv[] = {
-    "gnunet-testbed-helper",
+    "gnunet-helper-testbed",
     NULL
   };
   const char *controller_name = "127.0.0.1";
 
   helper =
-      GNUNET_HELPER_start (GNUNET_YES, "gnunet-testbed-helper", binary_argv,
+      GNUNET_HELPER_start (GNUNET_YES, "gnunet-helper-testbed", binary_argv,
                            &mst_cb, &exp_cb, NULL);
   GNUNET_assert (NULL != helper);
   cfg = GNUNET_CONFIGURATION_dup (cfg2);
@@ -239,11 +239,11 @@ main (int argc, char **argv)
 
   result = GNUNET_OK;
   if (GNUNET_OK !=
-      GNUNET_PROGRAM_run (argc, argv, "test_gnunet_testbed_helper",
-                          "Testcase for testing gnunet-testbed-helper.c",
+      GNUNET_PROGRAM_run (argc, argv, "test_gnunet_helper_testbed",
+                          "Testcase for testing gnunet-helper-testbed.c",
                           options, &run, NULL))
     return 1;
   return (GNUNET_OK == result) ? 0 : 1;
 }
 
-/* end of test_gnunet_testbed_helper.c */
+/* end of test_gnunet_helper_testbed.c */
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index ecc897205..48c55e470 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -68,6 +68,12 @@
 
 
 /**
+ * Testbed Helper binary name
+ */
+#define HELPER_TESTBED_BINARY "gnunet-helper-testbed"
+
+
+/**
  * The message queue for sending messages to the controller service
  */
 struct MessageQueue
@@ -1143,11 +1149,11 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
   if ((NULL == host) || (0 == GNUNET_TESTBED_host_get_id_ (host)))
   {
     char *const binary_argv[] = {
-      "gnunet-testbed-helper", NULL
+      HELPER_TESTBED_BINARY, NULL
     };
 
     cp->helper =
-        GNUNET_HELPER_start (GNUNET_YES, "gnunet-testbed-helper", binary_argv,
+        GNUNET_HELPER_start (GNUNET_YES, HELPER_TESTBED_BINARY, binary_argv,
                              &helper_mst, &helper_exp_cb, cp);
   }
   else
@@ -1172,7 +1178,7 @@ GNUNET_TESTBED_controller_start (const char *controller_ip,
     remote_args[argp++] = "-o";
     remote_args[argp++] = "BatchMode=yes";
     remote_args[argp++] = cp->dst;
-    remote_args[argp++] = "gnunet-testbed-helper";
+    remote_args[argp++] = HELPER_TESTBED_BINARY;
     remote_args[argp++] = NULL;
     GNUNET_assert (argp == 8);
     cp->helper =
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index 1bc6bffc3..e510706a8 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -21,7 +21,7 @@
 /**
  * @file testbed/testbed_helper.h
  * @brief Message formats for communication between testbed api and
- *          gnunet-testbed-helper process
+ *          gnunet-helper-testbed process
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
 
@@ -29,7 +29,7 @@
 #define TESTBED_HELPER_H
 
 /**
- * Initialization message for gnunet-testbed-helper to start testbed service
+ * Initialization message for gnunet-helper-testbed to start testbed service
  */
 struct GNUNET_TESTBED_HelperInit
 {