osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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

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
This commit is contained in:
Alexis La Goutte 2013-05-27 16:20:57 +00:00
parent 816ed3ce0d
commit 8cd231162b
5 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/dissectors/Makefile.common
View 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 \

1
epan/dissectors/packet-ieee80211.c
View File

@ -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>

8
epan/dissectors/packet-ieee80211.h
View 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);

1
epan/dissectors/packet-wifi-p2p.c
View File

@ -28,7 +28,6 @@
#include <epan/expert.h>
#include "packet-ieee80211.h"
#include "packet-wifi-p2p.h"
enum {
P2P_ATTR_STATUS = 0,

36
epan/dissectors/packet-wifi-p2p.h
View File

@ -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