[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21332 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21332 - gnunet/src/transport |
Date: |
Mon, 7 May 2012 22:48:22 +0200 |
Author: grothoff
Date: 2012-05-07 22:48:22 +0200 (Mon, 07 May 2012)
New Revision: 21332
Modified:
gnunet/src/transport/plugin_transport_wlan.c
Log:
-ugh
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2012-05-07 19:46:56 UTC
(rev 21331)
+++ gnunet/src/transport/plugin_transport_wlan.c 2012-05-07 20:48:22 UTC
(rev 21332)
@@ -513,7 +513,18 @@
*/
struct MacEndpoint
{
+
/**
+ * dll next
+ */
+ struct MacEndpoint *next;
+
+ /**
+ * dll prev
+ */
+ struct MacEndpoint *prev;
+
+ /**
* Pointer to the global plugin struct.
*/
struct Plugin *plugin;
@@ -541,16 +552,6 @@
struct FragmentMessage *sending_messages_tail;
/**
- * dll next
- */
- struct MacEndpoint *next;
-
- /**
- * dll prev
- */
- struct MacEndpoint *prev;
-
- /**
* peer mac address
*/
struct GNUNET_TRANSPORT_WLAN_MacAddress addr;
@@ -1460,33 +1461,27 @@
"wlan_transport_stop_wlan_helper not needed, helper
already stopped!");
return GNUNET_YES;
}
-
if (plugin->server_write_delay_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->server_write_delay_task);
plugin->server_write_delay_task = GNUNET_SCHEDULER_NO_TASK;
}
-
if (plugin->server_write_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->server_write_task);
plugin->server_write_task = GNUNET_SCHEDULER_NO_TASK;
}
-
if (plugin->server_read_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->server_read_task);
plugin->server_read_task = GNUNET_SCHEDULER_NO_TASK;
}
-
GNUNET_DISK_pipe_close (plugin->server_stdout);
GNUNET_DISK_pipe_close (plugin->server_stdin);
GNUNET_OS_process_kill (plugin->server_proc, SIGKILL);
GNUNET_OS_process_wait (plugin->server_proc);
GNUNET_OS_process_close (plugin->server_proc);
-
plugin->helper_is_running = GNUNET_NO;
-
return GNUNET_YES;
}
@@ -1598,7 +1593,8 @@
/**
- * function to send a hello beacon
+ * Function to send a HELLO beacon
+ *
* @param plugin pointer to the plugin struct
*/
static void
@@ -1630,9 +1626,8 @@
if (bytes == GNUNET_SYSERR)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
- _
- ("Error writing to wlan helper. errno == %d, ERROR:
%s\n"),
- errno, strerror (errno));
+ _("Error writing to WLAN helper: %s\n"),
+ STRERROR (errno));
finish = GNUNET_malloc (sizeof (struct Finish_send));
finish->plugin = plugin;
finish->head_of_next_write = NULL;
@@ -1866,7 +1861,7 @@
set_next_send (plugin);
return;
}
- GNUNET_STATISTICS_update (plugin->env->stats, _("# wlan fragments send"), 1,
+ GNUNET_STATISTICS_update (plugin->env->stats, _("# WLAN fragments sent"), 1,
GNUNET_NO);
fmq = plugin->sending_messages_head;
@@ -1893,9 +1888,8 @@
if (bytes == GNUNET_SYSERR)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME,
- _
- ("Error writing to wlan helper. errno == %d, ERROR:
%s\n"),
- errno, strerror (errno));
+ _("Error writing to WLAN helper: %s\n"),
+ STRERROR (errno));
finish->head_of_next_write = (char*) fm->radioHeader;
finish->size = ntohs (fm->radioHeader->header.size);
restart_helper (plugin, finish);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21332 - gnunet/src/transport,
gnunet <=