From a70fbf63796b1b9c88209fd4400e6303b51d21ac Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 11 Dec 2011 15:39:53 +0000 Subject: [PATCH] renaming WLAN helper process to gnunet-helper-transport-wlan in order to satisfy naming conventions --- src/transport/Makefile.am | 18 +++++----- ...c => gnunet-helper-transport-wlan-dummy.c} | 2 +- ...elper.c => gnunet-helper-transport-wlan.c} | 4 +-- src/transport/gnunet-transport-wlan-sender.c | 4 +-- src/transport/plugin_transport_wlan.c | 34 +++++++++---------- 5 files changed, 31 insertions(+), 31 deletions(-) rename src/transport/{gnunet-transport-wlan-helper-dummy.c => gnunet-helper-transport-wlan-dummy.c} (99%) rename src/transport/{gnunet-transport-wlan-helper.c => gnunet-helper-transport-wlan.c} (99%) diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index f1f70acfe..8418c92a2 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -33,8 +33,8 @@ if USE_COVERAGE endif if LINUX - WLAN_BIN = gnunet-transport-wlan-helper - WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy + WLAN_BIN = gnunet-helper-transport-wlan + WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy WLAN_BIN_SENDER = gnunet-transport-wlan-sender WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la WLAN_API_TEST = test_transport_api_wlan @@ -45,8 +45,8 @@ endif if LINUX install-exec-hook: - $(SUDO_BINARY) chown root:root $(bindir)/gnunet-transport-wlan-helper || true - $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-transport-wlan-helper || true + $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wlan || true + $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || true else install-exec-hook: endif @@ -107,12 +107,12 @@ gnunet_transport_certificate_creation_SOURCES = \ gnunet_transport_certificate_creation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la -gnunet_transport_wlan_helper_SOURCES = \ - gnunet-transport-wlan-helper.c +gnunet_helper_transport_wlan_SOURCES = \ + gnunet-helper-transport-wlan.c -gnunet_transport_wlan_helper_dummy_SOURCES = \ - gnunet-transport-wlan-helper-dummy.c -gnunet_transport_wlan_helper_dummy_LDADD = \ +gnunet_helper_transport_wlan_dummy_SOURCES = \ + gnunet-helper-transport-wlan-dummy.c +gnunet_helper_transport_wlan_dummy_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la gnunet_transport_wlan_sender_SOURCES = \ diff --git a/src/transport/gnunet-transport-wlan-helper-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c similarity index 99% rename from src/transport/gnunet-transport-wlan-helper-dummy.c rename to src/transport/gnunet-helper-transport-wlan-dummy.c index f456c3f60..c18216b1c 100644 --- a/src/transport/gnunet-transport-wlan-helper-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c @@ -18,7 +18,7 @@ Boston, MA 02111-1307, USA. */ /** - * @file transport/gnunet-transport-wlan-helper-dummy.c + * @file transport/gnunet-helper-transport-wlan-dummy.c * @brief helper for the testcases for plugin_transport_wlan.c * @author David Brodski */ diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-helper-transport-wlan.c similarity index 99% rename from src/transport/gnunet-transport-wlan-helper.c rename to src/transport/gnunet-helper-transport-wlan.c index 5cfbef8e8..0bc6d88ff 100644 --- a/src/transport/gnunet-transport-wlan-helper.c +++ b/src/transport/gnunet-helper-transport-wlan.c @@ -62,7 +62,7 @@ */ /** - * @file src/transport/gnunet-transport-wlan-helper.c + * @file src/transport/gnunet-helper-transport-wlan.c * @brief wlan layer two server; must run as root (SUID will do) * This code will work under GNU/Linux only. * @author David Brodski @@ -1709,4 +1709,4 @@ main (int argc, char *argv[]) return 1; /* we never exit 'normally' */ } -/* end of gnunet-transport-wlan-helper.c */ +/* end of gnunet-helper-transport-wlan.c */ diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c index 69c4963ed..2096afaee 100644 --- a/src/transport/gnunet-transport-wlan-sender.c +++ b/src/transport/gnunet-transport-wlan-sender.c @@ -225,10 +225,10 @@ main (int argc, char *argv[]) (void) close (commpipe[1]); /* Close unused side of pipe (out side) */ /* Replace the child fork with a new process */ if (execl - ("gnunet-transport-wlan-helper", "gnunet-transport-wlan-helper", + ("gnunet-helper-transport-wlan", "gnunet-helper-transport-wlan", argv[1], NULL) == -1) { - fprintf (stderr, "Could not start gnunet-transport-wlan-helper!"); + fprintf (stderr, "Could not start gnunet-helper-transport-wlan!"); _exit (1); } } diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index d7b061d70..de89cd86c 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c @@ -170,22 +170,22 @@ struct Plugin struct GNUNET_SERVER_MessageStreamTokenizer *data_tokenizer; /** - * stdout pipe handle for the gnunet-wlan-helper process + * stdout pipe handle for the gnunet-helper-transport-wlan process */ struct GNUNET_DISK_PipeHandle *server_stdout; /** - * stdout file handle for the gnunet-wlan-helper process + * stdout file handle for the gnunet-helper-transport-wlan process */ const struct GNUNET_DISK_FileHandle *server_stdout_handle; /** - * stdin pipe handle for the gnunet-wlan-helper process + * stdin pipe handle for the gnunet-helper-transport-wlan process */ struct GNUNET_DISK_PipeHandle *server_stdin; /** - * stdin file handle for the gnunet-wlan-helper process + * stdin file handle for the gnunet-helper-transport-wlan process */ const struct GNUNET_DISK_FileHandle *server_stdin_handle; @@ -1370,7 +1370,7 @@ add_message_for_send (void *cls, const struct GNUNET_MessageHeader *hdr) /** - * We have been notified that wlan-helper has written something to stdout. + * We have been notified that gnunet-helper-transport-wlan has written something to stdout. * Handle the output, then reschedule this function to be called again once * more is available. * @@ -1399,7 +1399,7 @@ wlan_plugin_helper_read (void *cls, #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, _ - ("Finished reading from wlan-helper stdout with code: %d\n"), + ("Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"), bytes); #endif return; @@ -1415,7 +1415,7 @@ wlan_plugin_helper_read (void *cls, } /** - * Start the gnunet-wlan-helper process. + * Start the gnunet-helper-transport-wlan process. * * @param plugin the transport plugin * @return GNUNET_YES if process was started, GNUNET_SYSERR on error @@ -1423,8 +1423,8 @@ wlan_plugin_helper_read (void *cls, static int wlan_transport_start_wlan_helper (struct Plugin *plugin) { - const char *filenamehw = "gnunet-transport-wlan-helper"; - const char *filenameloopback = "gnunet-transport-wlan-helper-dummy"; + const char *filenamehw = "gnunet-helper-transport-wlan"; + const char *filenameloopback = "gnunet-helper-transport-wlan-dummy"; char *absolute_filename = NULL; if (plugin->helper_is_running == GNUNET_YES) @@ -1475,7 +1475,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, - "Starting gnunet-wlan-helper process cmd: %s %s %i\n", + "Starting gnunet-helper-transport-wlan process cmd: %s %s %i\n", filenamehw, plugin->interface, plugin->testmode); #endif @@ -1489,13 +1489,13 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) else if (GNUNET_OS_check_helper_binary (filenamehw) == GNUNET_NO) { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, - "gnunet-transport-wlan-helper is not suid, please change it or look at the doku\n"); + "gnunet-helper-transport-wlan is not suid, please change it or look at the doku\n"); GNUNET_break (0); } else { GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, - "gnunet-transport-wlan-helper not found, please look if it exists and is the $PATH variable!\n"); + "gnunet-helper-transport-wlan not found, please look if it exists and is the $PATH variable!\n"); GNUNET_break (0); } @@ -1505,7 +1505,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, - "Starting gnunet-transport-wlan-helper-dummy loopback 1 process cmd: %s %s %i\n", + "Starting gnunet-helper-transport-wlan-dummy loopback 1 process cmd: %s %s %i\n", absolute_filename, plugin->interface, plugin->testmode); #endif plugin->server_proc = @@ -1524,7 +1524,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) { #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, - "Starting gnunet-transport-wlan-helper-dummy loopback 2 process cmd: %s %s %i\n", + "Starting gnunet-helper-transport-wlan-dummy loopback 2 process cmd: %s %s %i\n", absolute_filename, plugin->interface, plugin->testmode); #endif @@ -1546,7 +1546,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) { #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, - "Failed to start gnunet-transport-wlan-helper process\n"); + "Failed to start gnunet-helper-transport-wlan process\n"); #endif return GNUNET_SYSERR; } @@ -1571,7 +1571,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) #if DEBUG_wlan GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, - "Adding server_read_task for the wlan-helper\n"); + "Adding server_read_task for the gnunet-helper-transport-wlan\n"); #endif plugin->server_read_task = @@ -1584,7 +1584,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) } /** - * Stops the gnunet-wlan-helper process. + * Stops the gnunet-helper-transport-wlan process. * * @param plugin the transport plugin * @return GNUNET_YES if process was started, GNUNET_SYSERR on error -- 2.25.1