diff options
author | ng0 <ng0@n0.is> | 2019-09-08 12:33:09 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-08 12:33:09 +0000 |
commit | d41ed82a4ea0cc8e1674b6d5d2c49fd6462610bb (patch) | |
tree | 9efd18ea7d425652085ed0bd5e8e45604bc5f6b9 /src/transport/plugin_transport_wlan.h | |
parent | a0fce305c565c0937d917a92712f15e9c5736260 (diff) | |
download | gnunet-d41ed82a4ea0cc8e1674b6d5d2c49fd6462610bb.tar.gz gnunet-d41ed82a4ea0cc8e1674b6d5d2c49fd6462610bb.zip |
uncrustify as demanded.
Diffstat (limited to 'src/transport/plugin_transport_wlan.h')
-rw-r--r-- | src/transport/plugin_transport_wlan.h | 53 |
1 files changed, 21 insertions, 32 deletions
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h index 926e16e6f..cdc3e34ff 100644 --- a/src/transport/plugin_transport_wlan.h +++ b/src/transport/plugin_transport_wlan.h | |||
@@ -1,19 +1,19 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | Copyright (C) 2010, 2011 GNUnet e.V. | 3 | Copyright (C) 2010, 2011 GNUnet e.V. |
4 | 4 | ||
5 | GNUnet is free software: you can redistribute it and/or modify it | 5 | GNUnet is free software: you can redistribute it and/or modify it |
6 | under the terms of the GNU Affero General Public License as published | 6 | under the terms of the GNU Affero General Public License as published |
7 | by the Free Software Foundation, either version 3 of the License, | 7 | by the Free Software Foundation, either version 3 of the License, |
8 | or (at your option) any later version. | 8 | or (at your option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | Affero General Public License for more details. | 13 | Affero General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU Affero General Public License | 15 | You should have received a copy of the GNU Affero General Public License |
16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | 17 | ||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | #ifdef MINGW | 35 | #ifdef MINGW |
36 | #define MAC_ADDR_SIZE 8 | 36 | #define MAC_ADDR_SIZE 8 |
37 | typedef uint8_t u_int8_t; | 37 | typedef uint8_t u_int8_t; |
38 | #else | 38 | #else |
39 | #define MAC_ADDR_SIZE 6 | 39 | #define MAC_ADDR_SIZE 6 |
40 | #endif | 40 | #endif |
@@ -63,16 +63,14 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
63 | /** | 63 | /** |
64 | * A MAC Address. | 64 | * A MAC Address. |
65 | */ | 65 | */ |
66 | struct GNUNET_TRANSPORT_WLAN_MacAddress | 66 | struct GNUNET_TRANSPORT_WLAN_MacAddress { |
67 | { | ||
68 | uint8_t mac[MAC_ADDR_SIZE]; | 67 | uint8_t mac[MAC_ADDR_SIZE]; |
69 | }; | 68 | }; |
70 | 69 | ||
71 | /** | 70 | /** |
72 | * Format of a WLAN Control Message. | 71 | * Format of a WLAN Control Message. |
73 | */ | 72 | */ |
74 | struct GNUNET_TRANSPORT_WLAN_HelperControlMessage | 73 | struct GNUNET_TRANSPORT_WLAN_HelperControlMessage { |
75 | { | ||
76 | /** | 74 | /** |
77 | * Message header. Type is | 75 | * Message header. Type is |
78 | * GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL | 76 | * GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL |
@@ -88,9 +86,7 @@ struct GNUNET_TRANSPORT_WLAN_HelperControlMessage | |||
88 | /** | 86 | /** |
89 | * generic definitions for IEEE 802.3 frames | 87 | * generic definitions for IEEE 802.3 frames |
90 | */ | 88 | */ |
91 | struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame | 89 | struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame { |
92 | { | ||
93 | |||
94 | /** | 90 | /** |
95 | * Address 1: destination address in ad-hoc mode or AP, BSSID if station, | 91 | * Address 1: destination address in ad-hoc mode or AP, BSSID if station, |
96 | */ | 92 | */ |
@@ -105,15 +101,13 @@ struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame | |||
105 | * Packet type ID. | 101 | * Packet type ID. |
106 | */ | 102 | */ |
107 | uint16_t type; | 103 | uint16_t type; |
108 | |||
109 | }; | 104 | }; |
110 | 105 | ||
111 | 106 | ||
112 | /** | 107 | /** |
113 | * generic definitions for IEEE 802.11 frames | 108 | * generic definitions for IEEE 802.11 frames |
114 | */ | 109 | */ |
115 | struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame | 110 | struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame { |
116 | { | ||
117 | /** | 111 | /** |
118 | * 802.11 Frame Control field. A bitmask. The overall field is a | 112 | * 802.11 Frame Control field. A bitmask. The overall field is a |
119 | * 16-bit mask of the respecitve fields. The lowest two bits should | 113 | * 16-bit mask of the respecitve fields. The lowest two bits should |
@@ -157,7 +151,6 @@ struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame | |||
157 | u_int8_t llc[4]; | 151 | u_int8_t llc[4]; |
158 | 152 | ||
159 | /* payload */ | 153 | /* payload */ |
160 | |||
161 | } GNUNET_PACKED; | 154 | } GNUNET_PACKED; |
162 | 155 | ||
163 | 156 | ||
@@ -166,9 +159,7 @@ struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame | |||
166 | * Message from the plugin to the WLAN helper: send the given message with the | 159 | * Message from the plugin to the WLAN helper: send the given message with the |
167 | * given connection parameters. | 160 | * given connection parameters. |
168 | */ | 161 | */ |
169 | struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage | 162 | struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage { |
170 | { | ||
171 | |||
172 | /** | 163 | /** |
173 | * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER'. | 164 | * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER'. |
174 | */ | 165 | */ |
@@ -207,9 +198,7 @@ struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage | |||
207 | /** | 198 | /** |
208 | * struct to represent infos gathered form the radiotap fields, see RadiotapHeader for more Infos | 199 | * struct to represent infos gathered form the radiotap fields, see RadiotapHeader for more Infos |
209 | */ | 200 | */ |
210 | struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage | 201 | struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage { |
211 | { | ||
212 | |||
213 | /** | 202 | /** |
214 | * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER'. | 203 | * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER'. |
215 | */ | 204 | */ |
@@ -273,7 +262,7 @@ GNUNET_NETWORK_STRUCT_END | |||
273 | * GNUnet bssid | 262 | * GNUnet bssid |
274 | */ | 263 | */ |
275 | static const struct GNUNET_TRANSPORT_WLAN_MacAddress mac_bssid_gnunet = { | 264 | static const struct GNUNET_TRANSPORT_WLAN_MacAddress mac_bssid_gnunet = { |
276 | {0x13, 0x22, 0x33, 0x44, 0x55, 0x66} | 265 | { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 } |
277 | }; | 266 | }; |
278 | 267 | ||
279 | 268 | ||
@@ -281,7 +270,7 @@ static const struct GNUNET_TRANSPORT_WLAN_MacAddress mac_bssid_gnunet = { | |||
281 | * Broadcast MAC | 270 | * Broadcast MAC |
282 | */ | 271 | */ |
283 | static const struct GNUNET_TRANSPORT_WLAN_MacAddress bc_all_mac = { | 272 | static const struct GNUNET_TRANSPORT_WLAN_MacAddress bc_all_mac = { |
284 | {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} | 273 | { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } |
285 | }; | 274 | }; |
286 | 275 | ||
287 | #endif | 276 | #endif |