diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-05-06 12:07:44 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-05-06 12:07:44 +0000 |
commit | 50e121a661868af5c25bfa5d26af3cbc92ed5cb5 (patch) | |
tree | f4236fc15edc716e12d16e10ac1b825e3541453d /src/transport/plugin_transport_wlan.c | |
parent | d59a2cd67b2d5f569bb2f2b18ee5910b9cb770e3 (diff) | |
download | gnunet-50e121a661868af5c25bfa5d26af3cbc92ed5cb5.tar.gz gnunet-50e121a661868af5c25bfa5d26af3cbc92ed5cb5.zip |
-removing odd error message, fixing english, removing dead code
Diffstat (limited to 'src/transport/plugin_transport_wlan.c')
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 85 |
1 files changed, 10 insertions, 75 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index a3d90b598..0e59b6852 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -40,11 +40,6 @@ | |||
40 | #include "gnunet_fragmentation_lib.h" | 40 | #include "gnunet_fragmentation_lib.h" |
41 | #include "gnunet_constants.h" | 41 | #include "gnunet_constants.h" |
42 | 42 | ||
43 | /** | ||
44 | * DEBUG switch | ||
45 | */ | ||
46 | #define DEBUG_WLAN GNUNET_EXTRA_LOGGING | ||
47 | |||
48 | 43 | ||
49 | #define PROTOCOL_PREFIX "wlan" | 44 | #define PROTOCOL_PREFIX "wlan" |
50 | 45 | ||
@@ -662,60 +657,6 @@ static void | |||
662 | finish_sending (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); | 657 | finish_sending (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc); |
663 | 658 | ||
664 | 659 | ||
665 | /** | ||
666 | * Generates a nice hexdump of a memory area. | ||
667 | * | ||
668 | * \param mem pointer to memory to dump | ||
669 | * \param length how many bytes to dump | ||
670 | */ | ||
671 | static void | ||
672 | hexdump (const void *mem, unsigned length) | ||
673 | { | ||
674 | char line[80]; | ||
675 | char *src = (char *) mem; | ||
676 | |||
677 | printf ("dumping %u bytes from %p\r\n" | ||
678 | " 0 1 2 3 4 5 6 7 8 9 A B C D E F 0123456789ABCDEF\r\n", | ||
679 | length, src); | ||
680 | unsigned i; | ||
681 | int j; | ||
682 | |||
683 | for (i = 0; i < length; i += 16, src += 16) | ||
684 | { | ||
685 | char *t = line; | ||
686 | |||
687 | t += sprintf (t, "%04x: ", i); | ||
688 | for (j = 0; j < 16; j++) | ||
689 | { | ||
690 | if (i + j < length) | ||
691 | t += sprintf (t, "%02X", src[j] & 0xff); | ||
692 | else | ||
693 | t += sprintf (t, " "); | ||
694 | |||
695 | t += sprintf (t, (j % 2) ? " " : "-"); | ||
696 | } | ||
697 | |||
698 | t += sprintf (t, " "); | ||
699 | for (j = 0; j < 16; j++) | ||
700 | { | ||
701 | if (i + j < length) | ||
702 | { | ||
703 | if (isprint ((unsigned char) src[j])) | ||
704 | t += sprintf (t, "%c", src[j]); | ||
705 | else | ||
706 | t += sprintf (t, "."); | ||
707 | } | ||
708 | else | ||
709 | { | ||
710 | t += sprintf (t, " "); | ||
711 | } | ||
712 | } | ||
713 | |||
714 | t += sprintf (t, "\r\n"); | ||
715 | printf ("%s", line); | ||
716 | } | ||
717 | } | ||
718 | |||
719 | 660 | ||
720 | /** | 661 | /** |
721 | * Function to find a MacEndpoint with a specific mac addr | 662 | * Function to find a MacEndpoint with a specific mac addr |
@@ -1065,6 +1006,7 @@ set_next_send (struct Plugin *plugin) | |||
1065 | } | 1006 | } |
1066 | } | 1007 | } |
1067 | 1008 | ||
1009 | |||
1068 | /** | 1010 | /** |
1069 | * Function to get the next queued Session, removes the session from the queue | 1011 | * Function to get the next queued Session, removes the session from the queue |
1070 | * @param plugin pointer to the plugin struct | 1012 | * @param plugin pointer to the plugin struct |
@@ -1075,7 +1017,7 @@ get_next_queue_session (struct Plugin *plugin) | |||
1075 | { | 1017 | { |
1076 | struct Session *session; | 1018 | struct Session *session; |
1077 | struct Sessionqueue *sessionqueue; | 1019 | struct Sessionqueue *sessionqueue; |
1078 | struct Sessionqueue *sessionqueue_alt; | 1020 | struct Sessionqueue *sessionqueue_old; |
1079 | struct PendingMessage *pm; | 1021 | struct PendingMessage *pm; |
1080 | 1022 | ||
1081 | sessionqueue = plugin->pending_Sessions_head; | 1023 | sessionqueue = plugin->pending_Sessions_head; |
@@ -1089,21 +1031,17 @@ get_next_queue_session (struct Plugin *plugin) | |||
1089 | 1031 | ||
1090 | if (pm == NULL) | 1032 | if (pm == NULL) |
1091 | { | 1033 | { |
1092 | GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, PLUGIN_LOG_NAME, | 1034 | sessionqueue_old = sessionqueue; |
1093 | "pending message is empty, should not happen. session %p\n", | ||
1094 | session); | ||
1095 | sessionqueue_alt = sessionqueue; | ||
1096 | sessionqueue = sessionqueue->next; | 1035 | sessionqueue = sessionqueue->next; |
1097 | plugin->pendingsessions--; | 1036 | plugin->pendingsessions--; |
1098 | GNUNET_STATISTICS_set (plugin->env->stats, _("# wlan pending sessions"), | 1037 | GNUNET_STATISTICS_set (plugin->env->stats, _("# wlan pending sessions"), |
1099 | plugin->pendingsessions, GNUNET_NO); | 1038 | plugin->pendingsessions, GNUNET_NO); |
1100 | GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head, | 1039 | GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head, |
1101 | plugin->pending_Sessions_tail, | 1040 | plugin->pending_Sessions_tail, |
1102 | sessionqueue_alt); | 1041 | sessionqueue_old); |
1103 | 1042 | ||
1104 | GNUNET_free (sessionqueue_alt); | 1043 | GNUNET_free (sessionqueue_old); |
1105 | continue; | 1044 | continue; |
1106 | |||
1107 | } | 1045 | } |
1108 | 1046 | ||
1109 | //check for message timeout | 1047 | //check for message timeout |
@@ -1144,16 +1082,16 @@ get_next_queue_session (struct Plugin *plugin) | |||
1144 | 1082 | ||
1145 | if (session->pending_message_head == NULL) | 1083 | if (session->pending_message_head == NULL) |
1146 | { | 1084 | { |
1147 | sessionqueue_alt = sessionqueue; | 1085 | sessionqueue_old = sessionqueue; |
1148 | sessionqueue = sessionqueue->next; | 1086 | sessionqueue = sessionqueue->next; |
1149 | plugin->pendingsessions--; | 1087 | plugin->pendingsessions--; |
1150 | GNUNET_STATISTICS_set (plugin->env->stats, _("# wlan pending sessions"), | 1088 | GNUNET_STATISTICS_set (plugin->env->stats, _("# wlan pending sessions"), |
1151 | plugin->pendingsessions, GNUNET_NO); | 1089 | plugin->pendingsessions, GNUNET_NO); |
1152 | GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head, | 1090 | GNUNET_CONTAINER_DLL_remove (plugin->pending_Sessions_head, |
1153 | plugin->pending_Sessions_tail, | 1091 | plugin->pending_Sessions_tail, |
1154 | sessionqueue_alt); | 1092 | sessionqueue_old); |
1155 | 1093 | ||
1156 | GNUNET_free (sessionqueue_alt); | 1094 | GNUNET_free (sessionqueue_old); |
1157 | } | 1095 | } |
1158 | } | 1096 | } |
1159 | 1097 | ||
@@ -1161,6 +1099,7 @@ get_next_queue_session (struct Plugin *plugin) | |||
1161 | return NULL; | 1099 | return NULL; |
1162 | } | 1100 | } |
1163 | 1101 | ||
1102 | |||
1164 | /** | 1103 | /** |
1165 | * frees the space of a message in the fragment queue (send queue) | 1104 | * frees the space of a message in the fragment queue (send queue) |
1166 | * @param plugin the plugin struct | 1105 | * @param plugin the plugin struct |
@@ -1771,12 +1710,12 @@ fragmentmessage_timeout (void *cls, | |||
1771 | free_fragment_message (fm->session->mac->plugin, fm); | 1710 | free_fragment_message (fm->session->mac->plugin, fm); |
1772 | } | 1711 | } |
1773 | 1712 | ||
1713 | |||
1774 | /** | 1714 | /** |
1775 | * Function to check if there is some space in the fragment queue | 1715 | * Function to check if there is some space in the fragment queue |
1776 | * inserts a message if space is available | 1716 | * inserts a message if space is available |
1777 | * @param plugin the plugin struct | 1717 | * @param plugin the plugin struct |
1778 | */ | 1718 | */ |
1779 | |||
1780 | static void | 1719 | static void |
1781 | check_fragment_queue (struct Plugin *plugin) | 1720 | check_fragment_queue (struct Plugin *plugin) |
1782 | { | 1721 | { |
@@ -2141,9 +2080,6 @@ wlan_plugin_send (void *cls, | |||
2141 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, | 2080 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, PLUGIN_LOG_NAME, |
2142 | "New message for %p with size (incl wlan header) %u added\n", | 2081 | "New message for %p with size (incl wlan header) %u added\n", |
2143 | session, newmsg->message_size); | 2082 | session, newmsg->message_size); |
2144 | #if DEBUG_WLAN > 1 | ||
2145 | hexdump (msgbuf, GNUNET_MIN (msgbuf_size, 256)); | ||
2146 | #endif | ||
2147 | //queue session | 2083 | //queue session |
2148 | queue_session (plugin, session); | 2084 | queue_session (plugin, session); |
2149 | 2085 | ||
@@ -2419,7 +2355,6 @@ wlan_data_message_handler (void *cls, const struct GNUNET_MessageHeader *hdr) | |||
2419 | GNUNET_CRYPTO_crc32_n ((char *) wlanheader, | 2355 | GNUNET_CRYPTO_crc32_n ((char *) wlanheader, |
2420 | ntohs (wlanheader->header.size)), | 2356 | ntohs (wlanheader->header.size)), |
2421 | crc); | 2357 | crc); |
2422 | hexdump ((void *) hdr, ntohs (hdr->size)); | ||
2423 | return; | 2358 | return; |
2424 | } | 2359 | } |
2425 | 2360 | ||