From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8711 Wi...

[metze/wireshark/wip.git] / epan / dissectors / packet-ieee80211.h

diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h
index f7f99974df5e89d3b46a0fad1949484f7d8b56f6..b0d835a3f360d253d01a9934dfb7669900f85c17 100644 (file)
--- a/epan/dissectors/packet-ieee80211.h
+++ b/epan/dissectors/packet-ieee80211.h
@@ -24,19 +24,60 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ws_symbol_export.h"
+
+WS_DLL_PUBLIC
 void capture_ieee80211 (const guchar *, int, int, packet_counts *);
 void capture_ieee80211_datapad (const guchar *, int, int, packet_counts *);
 void capture_ieee80211_fixed (const guchar *, int, int, packet_counts *);
+void capture_ieee80211_ht (const guchar *, int, int, packet_counts *);
+
+WS_DLL_PUBLIC
+void capture_prism(const guchar *, int, int, packet_counts *);
+WS_DLL_PUBLIC
+void capture_wlancap(const guchar *, int, int, packet_counts *);
 
 void ieee_80211_add_tagged_parameters (tvbuff_t * tvb, int offset,
-       packet_info * pinfo, proto_tree * tree, int tagged_parameters_len);
+       packet_info * pinfo, proto_tree * tree, int tagged_parameters_len, int ftype);
+
+void dissect_wifi_p2p_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
+                        int offset, gint size);
+int dissect_wifi_p2p_public_action(packet_info *pinfo, proto_tree *tree,
+                                   tvbuff_t *tvb, int offset);
+int dissect_wifi_p2p_action(proto_tree *tree, tvbuff_t *tvb, int offset);
+void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
+                          int offset, gboolean request);
+
+void dissect_wifi_display_ie(packet_info *pinfo, proto_tree *tree,
+                            tvbuff_t *tvb, int offset, gint size);
+
+#define MAX_SSID_LEN    32
+#define MAX_PROTECT_LEN 10
+
+struct _wlan_stats {
+  guint8 channel;
+  guint8 ssid_len;
+  guchar ssid[MAX_SSID_LEN];
+  gchar protection[MAX_PROTECT_LEN];
+};
 
 typedef struct _wlan_hdr {
         address bssid;
         address src;
         address dst;
         guint16 type;
+        struct _wlan_stats stats;
 } wlan_hdr;
+
+#define WLANCAP_MAGIC_COOKIE_BASE 0x80211000
+#define WLANCAP_MAGIC_COOKIE_V1 0x80211001
+#define WLANCAP_MAGIC_COOKIE_V2 0x80211002
+
+/* UAT entry structure. */
+typedef struct {
+    guint8    key;
+    gchar    *string;
+} uat_wep_key_record_t;