diff options
-rw-r--r-- | src/transport/Makefile.am | 18 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan-dummy.c (renamed from src/transport/gnunet-transport-wlan-helper-dummy.c) | 2 | ||||
-rw-r--r-- | src/transport/gnunet-helper-transport-wlan.c (renamed from src/transport/gnunet-transport-wlan-helper.c) | 4 | ||||
-rw-r--r-- | src/transport/gnunet-transport-wlan-sender.c | 4 | ||||
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 34 |
5 files changed, 31 insertions, 31 deletions
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 | |||
33 | endif | 33 | endif |
34 | 34 | ||
35 | if LINUX | 35 | if LINUX |
36 | WLAN_BIN = gnunet-transport-wlan-helper | 36 | WLAN_BIN = gnunet-helper-transport-wlan |
37 | WLAN_BIN_DUMMY = gnunet-transport-wlan-helper-dummy | 37 | WLAN_BIN_DUMMY = gnunet-helper-transport-wlan-dummy |
38 | WLAN_BIN_SENDER = gnunet-transport-wlan-sender | 38 | WLAN_BIN_SENDER = gnunet-transport-wlan-sender |
39 | WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la | 39 | WLAN_PLUGIN_LA = libgnunet_plugin_transport_wlan.la |
40 | WLAN_API_TEST = test_transport_api_wlan | 40 | WLAN_API_TEST = test_transport_api_wlan |
@@ -45,8 +45,8 @@ endif | |||
45 | 45 | ||
46 | if LINUX | 46 | if LINUX |
47 | install-exec-hook: | 47 | install-exec-hook: |
48 | $(SUDO_BINARY) chown root:root $(bindir)/gnunet-transport-wlan-helper || true | 48 | $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-transport-wlan || true |
49 | $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-transport-wlan-helper || true | 49 | $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-transport-wlan || true |
50 | else | 50 | else |
51 | install-exec-hook: | 51 | install-exec-hook: |
52 | endif | 52 | endif |
@@ -107,12 +107,12 @@ gnunet_transport_certificate_creation_SOURCES = \ | |||
107 | gnunet_transport_certificate_creation_LDADD = \ | 107 | gnunet_transport_certificate_creation_LDADD = \ |
108 | $(top_builddir)/src/util/libgnunetutil.la | 108 | $(top_builddir)/src/util/libgnunetutil.la |
109 | 109 | ||
110 | gnunet_transport_wlan_helper_SOURCES = \ | 110 | gnunet_helper_transport_wlan_SOURCES = \ |
111 | gnunet-transport-wlan-helper.c | 111 | gnunet-helper-transport-wlan.c |
112 | 112 | ||
113 | gnunet_transport_wlan_helper_dummy_SOURCES = \ | 113 | gnunet_helper_transport_wlan_dummy_SOURCES = \ |
114 | gnunet-transport-wlan-helper-dummy.c | 114 | gnunet-helper-transport-wlan-dummy.c |
115 | gnunet_transport_wlan_helper_dummy_LDADD = \ | 115 | gnunet_helper_transport_wlan_dummy_LDADD = \ |
116 | $(top_builddir)/src/util/libgnunetutil.la | 116 | $(top_builddir)/src/util/libgnunetutil.la |
117 | 117 | ||
118 | gnunet_transport_wlan_sender_SOURCES = \ | 118 | 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 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 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | /** | 20 | /** |
21 | * @file transport/gnunet-transport-wlan-helper-dummy.c | 21 | * @file transport/gnunet-helper-transport-wlan-dummy.c |
22 | * @brief helper for the testcases for plugin_transport_wlan.c | 22 | * @brief helper for the testcases for plugin_transport_wlan.c |
23 | * @author David Brodski | 23 | * @author David Brodski |
24 | */ | 24 | */ |
diff --git a/src/transport/gnunet-transport-wlan-helper.c b/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 @@ | |||
62 | */ | 62 | */ |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * @file src/transport/gnunet-transport-wlan-helper.c | 65 | * @file src/transport/gnunet-helper-transport-wlan.c |
66 | * @brief wlan layer two server; must run as root (SUID will do) | 66 | * @brief wlan layer two server; must run as root (SUID will do) |
67 | * This code will work under GNU/Linux only. | 67 | * This code will work under GNU/Linux only. |
68 | * @author David Brodski | 68 | * @author David Brodski |
@@ -1709,4 +1709,4 @@ main (int argc, char *argv[]) | |||
1709 | return 1; /* we never exit 'normally' */ | 1709 | return 1; /* we never exit 'normally' */ |
1710 | } | 1710 | } |
1711 | 1711 | ||
1712 | /* end of gnunet-transport-wlan-helper.c */ | 1712 | /* 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[]) | |||
225 | (void) close (commpipe[1]); /* Close unused side of pipe (out side) */ | 225 | (void) close (commpipe[1]); /* Close unused side of pipe (out side) */ |
226 | /* Replace the child fork with a new process */ | 226 | /* Replace the child fork with a new process */ |
227 | if (execl | 227 | if (execl |
228 | ("gnunet-transport-wlan-helper", "gnunet-transport-wlan-helper", | 228 | ("gnunet-helper-transport-wlan", "gnunet-helper-transport-wlan", |
229 | argv[1], NULL) == -1) | 229 | argv[1], NULL) == -1) |
230 | { | 230 | { |
231 | fprintf (stderr, "Could not start gnunet-transport-wlan-helper!"); | 231 | fprintf (stderr, "Could not start gnunet-helper-transport-wlan!"); |
232 | _exit (1); | 232 | _exit (1); |
233 | } | 233 | } |
234 | } | 234 | } |
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 | |||
170 | struct GNUNET_SERVER_MessageStreamTokenizer *data_tokenizer; | 170 | struct GNUNET_SERVER_MessageStreamTokenizer *data_tokenizer; |
171 | 171 | ||
172 | /** | 172 | /** |
173 | * stdout pipe handle for the gnunet-wlan-helper process | 173 | * stdout pipe handle for the gnunet-helper-transport-wlan process |
174 | */ | 174 | */ |
175 | struct GNUNET_DISK_PipeHandle *server_stdout; | 175 | struct GNUNET_DISK_PipeHandle *server_stdout; |
176 | 176 | ||
177 | /** | 177 | /** |
178 | * stdout file handle for the gnunet-wlan-helper process | 178 | * stdout file handle for the gnunet-helper-transport-wlan process |
179 | */ | 179 | */ |
180 | const struct GNUNET_DISK_FileHandle *server_stdout_handle; | 180 | const struct GNUNET_DISK_FileHandle *server_stdout_handle; |
181 | 181 | ||
182 | /** | 182 | /** |
183 | * stdin pipe handle for the gnunet-wlan-helper process | 183 | * stdin pipe handle for the gnunet-helper-transport-wlan process |
184 | */ | 184 | */ |
185 | struct GNUNET_DISK_PipeHandle *server_stdin; | 185 | struct GNUNET_DISK_PipeHandle *server_stdin; |
186 | 186 | ||
187 | /** | 187 | /** |
188 | * stdin file handle for the gnunet-wlan-helper process | 188 | * stdin file handle for the gnunet-helper-transport-wlan process |
189 | */ | 189 | */ |
190 | const struct GNUNET_DISK_FileHandle *server_stdin_handle; | 190 | const struct GNUNET_DISK_FileHandle *server_stdin_handle; |
191 | 191 | ||
@@ -1370,7 +1370,7 @@ add_message_for_send (void *cls, const struct GNUNET_MessageHeader *hdr) | |||
1370 | 1370 | ||
1371 | 1371 | ||
1372 | /** | 1372 | /** |
1373 | * We have been notified that wlan-helper has written something to stdout. | 1373 | * We have been notified that gnunet-helper-transport-wlan has written something to stdout. |
1374 | * Handle the output, then reschedule this function to be called again once | 1374 | * Handle the output, then reschedule this function to be called again once |
1375 | * more is available. | 1375 | * more is available. |
1376 | * | 1376 | * |
@@ -1399,7 +1399,7 @@ wlan_plugin_helper_read (void *cls, | |||
1399 | #if DEBUG_wlan | 1399 | #if DEBUG_wlan |
1400 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, | 1400 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, |
1401 | _ | 1401 | _ |
1402 | ("Finished reading from wlan-helper stdout with code: %d\n"), | 1402 | ("Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"), |
1403 | bytes); | 1403 | bytes); |
1404 | #endif | 1404 | #endif |
1405 | return; | 1405 | return; |
@@ -1415,7 +1415,7 @@ wlan_plugin_helper_read (void *cls, | |||
1415 | } | 1415 | } |
1416 | 1416 | ||
1417 | /** | 1417 | /** |
1418 | * Start the gnunet-wlan-helper process. | 1418 | * Start the gnunet-helper-transport-wlan process. |
1419 | * | 1419 | * |
1420 | * @param plugin the transport plugin | 1420 | * @param plugin the transport plugin |
1421 | * @return GNUNET_YES if process was started, GNUNET_SYSERR on error | 1421 | * @return GNUNET_YES if process was started, GNUNET_SYSERR on error |
@@ -1423,8 +1423,8 @@ wlan_plugin_helper_read (void *cls, | |||
1423 | static int | 1423 | static int |
1424 | wlan_transport_start_wlan_helper (struct Plugin *plugin) | 1424 | wlan_transport_start_wlan_helper (struct Plugin *plugin) |
1425 | { | 1425 | { |
1426 | const char *filenamehw = "gnunet-transport-wlan-helper"; | 1426 | const char *filenamehw = "gnunet-helper-transport-wlan"; |
1427 | const char *filenameloopback = "gnunet-transport-wlan-helper-dummy"; | 1427 | const char *filenameloopback = "gnunet-helper-transport-wlan-dummy"; |
1428 | char *absolute_filename = NULL; | 1428 | char *absolute_filename = NULL; |
1429 | 1429 | ||
1430 | if (plugin->helper_is_running == GNUNET_YES) | 1430 | if (plugin->helper_is_running == GNUNET_YES) |
@@ -1475,7 +1475,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1475 | 1475 | ||
1476 | #if DEBUG_wlan | 1476 | #if DEBUG_wlan |
1477 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, | 1477 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, |
1478 | "Starting gnunet-wlan-helper process cmd: %s %s %i\n", | 1478 | "Starting gnunet-helper-transport-wlan process cmd: %s %s %i\n", |
1479 | filenamehw, plugin->interface, plugin->testmode); | 1479 | filenamehw, plugin->interface, plugin->testmode); |
1480 | #endif | 1480 | #endif |
1481 | 1481 | ||
@@ -1489,13 +1489,13 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1489 | else if (GNUNET_OS_check_helper_binary (filenamehw) == GNUNET_NO) | 1489 | else if (GNUNET_OS_check_helper_binary (filenamehw) == GNUNET_NO) |
1490 | { | 1490 | { |
1491 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, | 1491 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, |
1492 | "gnunet-transport-wlan-helper is not suid, please change it or look at the doku\n"); | 1492 | "gnunet-helper-transport-wlan is not suid, please change it or look at the doku\n"); |
1493 | GNUNET_break (0); | 1493 | GNUNET_break (0); |
1494 | } | 1494 | } |
1495 | else | 1495 | else |
1496 | { | 1496 | { |
1497 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, | 1497 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, |
1498 | "gnunet-transport-wlan-helper not found, please look if it exists and is the $PATH variable!\n"); | 1498 | "gnunet-helper-transport-wlan not found, please look if it exists and is the $PATH variable!\n"); |
1499 | GNUNET_break (0); | 1499 | GNUNET_break (0); |
1500 | } | 1500 | } |
1501 | 1501 | ||
@@ -1505,7 +1505,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1505 | 1505 | ||
1506 | #if DEBUG_wlan | 1506 | #if DEBUG_wlan |
1507 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, | 1507 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, |
1508 | "Starting gnunet-transport-wlan-helper-dummy loopback 1 process cmd: %s %s %i\n", | 1508 | "Starting gnunet-helper-transport-wlan-dummy loopback 1 process cmd: %s %s %i\n", |
1509 | absolute_filename, plugin->interface, plugin->testmode); | 1509 | absolute_filename, plugin->interface, plugin->testmode); |
1510 | #endif | 1510 | #endif |
1511 | plugin->server_proc = | 1511 | plugin->server_proc = |
@@ -1524,7 +1524,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1524 | { | 1524 | { |
1525 | #if DEBUG_wlan | 1525 | #if DEBUG_wlan |
1526 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, | 1526 | GNUNET_log_from (GNUNET_ERROR_TYPE_INFO, PLUGIN_LOG_NAME, |
1527 | "Starting gnunet-transport-wlan-helper-dummy loopback 2 process cmd: %s %s %i\n", | 1527 | "Starting gnunet-helper-transport-wlan-dummy loopback 2 process cmd: %s %s %i\n", |
1528 | absolute_filename, plugin->interface, plugin->testmode); | 1528 | absolute_filename, plugin->interface, plugin->testmode); |
1529 | #endif | 1529 | #endif |
1530 | 1530 | ||
@@ -1546,7 +1546,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1546 | { | 1546 | { |
1547 | #if DEBUG_wlan | 1547 | #if DEBUG_wlan |
1548 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, | 1548 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, |
1549 | "Failed to start gnunet-transport-wlan-helper process\n"); | 1549 | "Failed to start gnunet-helper-transport-wlan process\n"); |
1550 | #endif | 1550 | #endif |
1551 | return GNUNET_SYSERR; | 1551 | return GNUNET_SYSERR; |
1552 | } | 1552 | } |
@@ -1571,7 +1571,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1571 | 1571 | ||
1572 | #if DEBUG_wlan | 1572 | #if DEBUG_wlan |
1573 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, | 1573 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, |
1574 | "Adding server_read_task for the wlan-helper\n"); | 1574 | "Adding server_read_task for the gnunet-helper-transport-wlan\n"); |
1575 | #endif | 1575 | #endif |
1576 | 1576 | ||
1577 | plugin->server_read_task = | 1577 | plugin->server_read_task = |
@@ -1584,7 +1584,7 @@ wlan_transport_start_wlan_helper (struct Plugin *plugin) | |||
1584 | } | 1584 | } |
1585 | 1585 | ||
1586 | /** | 1586 | /** |
1587 | * Stops the gnunet-wlan-helper process. | 1587 | * Stops the gnunet-helper-transport-wlan process. |
1588 | * | 1588 | * |
1589 | * @param plugin the transport plugin | 1589 | * @param plugin the transport plugin |
1590 | * @return GNUNET_YES if process was started, GNUNET_SYSERR on error | 1590 | * @return GNUNET_YES if process was started, GNUNET_SYSERR on error |