diff options
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-ieee80211.h | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-wifi-p2p.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-wifi-p2p.h | 36 |
5 files changed, 8 insertions, 39 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index b2b68c1ac6..703936289f 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -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 \ diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 73171282ab..89a6cc51d4 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -102,7 +102,6 @@ #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> diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h index b9f0d3be8c..b0d835a3f3 100644 --- a/epan/dissectors/packet-ieee80211.h +++ b/epan/dissectors/packet-ieee80211.h @@ -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); diff --git a/epan/dissectors/packet-wifi-p2p.c b/epan/dissectors/packet-wifi-p2p.c index de04505ffd..fd14ae7e04 100644 --- a/epan/dissectors/packet-wifi-p2p.c +++ b/epan/dissectors/packet-wifi-p2p.c @@ -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 index 45b489b11d..0000000000 --- a/epan/dissectors/packet-wifi-p2p.h +++ /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 |