From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8711 Wi...
authorAlexis La Goutte <alexis.lagoutte@gmail.com>
Mon, 27 May 2013 16:20:57 +0000 (16:20 -0000)
committerAlexis La Goutte <alexis.lagoutte@gmail.com>
Mon, 27 May 2013 16:20:57 +0000 (16:20 -0000)
This matches the style used for Wi-Fi Display and gets rid of a minimal
header file for functionality that extends packet-ieee80211.c.

svn path=/trunk/; revision=49594

epan/dissectors/Makefile.common
epan/dissectors/packet-ieee80211.c
epan/dissectors/packet-ieee80211.h
epan/dissectors/packet-wifi-p2p.c
epan/dissectors/packet-wifi-p2p.h [deleted file]

index b2b68c1ac67d65051b4a903c2d467cb6462616ee..703936289f9fe5587033af23dcea281cb52728b6 100644 (file)
@@ -1559,7 +1559,6 @@ DISSECTOR_INCLUDES =      \
        packet-vlan.h   \
        packet-wap.h    \
        packet-wccp.h   \
-       packet-wifi-p2p.h       \
        packet-windows-common.h \
        packet-wlancertextn.h   \
        packet-wps.h    \
index 73171282ab9d2f5ca8cb9d02b24bba95d4be1b43..89a6cc51d47bb932be3c768a1e54dd46659d7bec 100644 (file)
 #include <epan/uat.h>
 
 #include "packet-wps.h"
-#include "packet-wifi-p2p.h"
 
 /*     Davide Schiera (2006-11-22): including AirPDcap project                */
 #include <epan/crypt/airpdcap_ws.h>
index b9f0d3be8c76c474148941f13a71e25db5341bb9..b0d835a3f360d253d01a9934dfb7669900f85c17 100644 (file)
@@ -43,6 +43,14 @@ 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, 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);
 
index de04505ffdde627e21d89d3db8742640929e5fa7..fd14ae7e04216d6ad7dd20a3d8514c1dec93bf36 100644 (file)
@@ -28,7 +28,6 @@
 #include <epan/expert.h>
 
 #include "packet-ieee80211.h"
-#include "packet-wifi-p2p.h"
 
 enum {
   P2P_ATTR_STATUS = 0,
diff --git a/epan/dissectors/packet-wifi-p2p.h b/epan/dissectors/packet-wifi-p2p.h
deleted file mode 100644 (file)
index 45b489b..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/* packet-wifi-p2p.h
- *
- * Wi-Fi P2P
- *
- * Copyright 2009-2010 Atheros Communications
- *
- * $Id$
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef _packet_wifi_p2p_h_
-#define _packet_wifi_p2p_h_
-
-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);
-
-#endif