X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fplugin_transport_wlan.h;h=926e16e6fec36980ccd87cdac43eb0a864bbebc3;hb=609e4becfe496ed62c2007db18d04fbc8d523476;hp=3f8e824049175a45a6f9b9ef44277b5982961c73;hpb=c307dc2bda434d1243422a6a102ac5dbb6fa00a2;p=oweals%2Fgnunet.git
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index 3f8e82404..926e16e6f 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -1,21 +1,21 @@
/*
This file is part of GNUnet
- (C) 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010, 2011 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
@@ -26,13 +26,37 @@
#ifndef PLUGIN_TRANSPORT_WLAN
#define PLUGIN_TRANSPORT_WLAN
-#include
+#include "gnunet_crypto_lib.h"
#include "gnunet_common.h"
/**
* Number fo bytes in a mac address.
*/
-#define MAC_ADDR_SIZE 6
+#ifdef MINGW
+ #define MAC_ADDR_SIZE 8
+ typedef uint8_t u_int8_t;
+#else
+ #define MAC_ADDR_SIZE 6
+#endif
+
+/**
+ * Value for "Management" in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_MGT 0x00
+
+/**
+ * Value for "Control" in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_CTL 0x04
+
+/**
+ * Value for DATA in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_DATA 0x08
+
GNUNET_NETWORK_STRUCT_BEGIN
@@ -61,6 +85,29 @@ struct GNUNET_TRANSPORT_WLAN_HelperControlMessage
struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
};
+/**
+ * generic definitions for IEEE 802.3 frames
+ */
+struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame
+{
+
+ /**
+ * Address 1: destination address in ad-hoc mode or AP, BSSID if station,
+ */
+ struct GNUNET_TRANSPORT_WLAN_MacAddress dst;
+
+ /**
+ * Address 2: source address if in ad-hoc-mode or station, BSSID if AP
+ */
+ struct GNUNET_TRANSPORT_WLAN_MacAddress src;
+
+ /**
+ * Packet type ID.
+ */
+ uint16_t type;
+
+};
+
/**
* generic definitions for IEEE 802.11 frames
@@ -68,7 +115,13 @@ struct GNUNET_TRANSPORT_WLAN_HelperControlMessage
struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame
{
/**
- * 802.11 Frame Control field,
+ * 802.11 Frame Control field. A bitmask. The overall field is a
+ * 16-bit mask of the respecitve fields. The lowest two bits should
+ * be 0, then comes the "type" (2 bits, see IEEE80211_FC0_TYPE_*
+ * constants), followed by 4-bit subtype (all zeros for ad-hoc),
+ * followed by various flags (to DS, from DS, more frag, retry,
+ * power management, more data, WEP, strict), all of which we also
+ * keep at zero.
*/
uint16_t frame_control GNUNET_PACKED;
@@ -93,7 +146,8 @@ struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame
struct GNUNET_TRANSPORT_WLAN_MacAddress addr3;
/**
- * 802.11 sequence control field.
+ * 802.11 sequence control field; contains fragment number an sequence
+ * number (we set this to all zeros).
*/
uint16_t sequence_control GNUNET_PACKED;
@@ -116,7 +170,7 @@ struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage
{
/**
- * Type is 'GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA'.
+ * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER'.
*/
struct GNUNET_MessageHeader header;
@@ -157,51 +211,51 @@ struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage
{
/**
- * Type is 'GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA'.
+ * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER'.
*/
struct GNUNET_MessageHeader header;
/**
- * FIXME: not initialized properly so far. (supposed to contain
- * information about which of the fields below are actually valid).
+ * Information about which of the fields below are actually valid.
+ * 0 for none. FIXME: not properly initialized so far (always zero).
*/
uint32_t ri_present GNUNET_PACKED;
/**
- * IEEE80211_RADIOTAP_TSFT
+ * IEEE80211_RADIOTAP_TSFT, 0 if unknown.
*/
uint64_t ri_mactime GNUNET_PACKED;
/**
* from radiotap
* either IEEE80211_RADIOTAP_DBM_ANTSIGNAL
- * or IEEE80211_RADIOTAP_DB_ANTSIGNAL
+ * or IEEE80211_RADIOTAP_DB_ANTSIGNAL, 0 if unknown.
*/
int32_t ri_power GNUNET_PACKED;
/**
* either IEEE80211_RADIOTAP_DBM_ANTNOISE
- * or IEEE80211_RADIOTAP_DB_ANTNOISE
+ * or IEEE80211_RADIOTAP_DB_ANTNOISE, 0 if unknown.
*/
int32_t ri_noise GNUNET_PACKED;
/**
- * IEEE80211_RADIOTAP_CHANNEL
+ * IEEE80211_RADIOTAP_CHANNEL, 0 if unknown.
*/
uint32_t ri_channel GNUNET_PACKED;
/**
- * Frequency we use. FIXME: not properly initialized so far!
+ * Frequency we use. 0 if unknown.
*/
uint32_t ri_freq GNUNET_PACKED;
/**
- * IEEE80211_RADIOTAP_RATE * 50000
+ * IEEE80211_RADIOTAP_RATE * 50000, 0 if unknown.
*/
uint32_t ri_rate GNUNET_PACKED;
/**
- * IEEE80211_RADIOTAP_ANTENNA
+ * IEEE80211_RADIOTAP_ANTENNA, 0 if unknown.
*/
uint32_t ri_antenna GNUNET_PACKED;