From Solomon Peachy: support for new "wlancap" 802.11 extra-information
header. Add overflow checks to "BYTES_ARE_IN_FRAME()", and cast all arguments to unsigned values (negative values should never be passed) to squelch compiler warnings. svn path=/trunk/; revision=6567
This commit is contained in:
Guy Harris
parent
b3e0a56390
commit
8ee4a65f76
3
AUTHORS
3
AUTHORS
|
|
@ -1307,7 +1307,8 @@ Chris Waters <chris[AT]waters.co.nz> {
|
|||
}
|
||||
|
||||
Solomon Peachy <pizza[AT]shaftnet.org> {
|
||||
WEP support and other mangling of the 802.11 disector
|
||||
WEP support and other mangling of the 802.11 dissector
|
||||
Support for new "wlancap" 802.11 extra-information header
|
||||
}
|
||||
|
||||
Jaime Fournier <jafour1[AT]yahoo.com> {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Makefile.am
|
||||
# Automake file for Ethereal
|
||||
#
|
||||
# $Id: Makefile.am,v 1.518 2002/11/04 12:10:59 sahlberg Exp $
|
||||
# $Id: Makefile.am,v 1.519 2002/11/06 21:49:29 guy Exp $
|
||||
#
|
||||
# Ethereal - Network traffic analyzer
|
||||
# By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -363,6 +363,7 @@ DISSECTOR_SRC = \
|
|||
packet-wccp.c \
|
||||
packet-wcp.c \
|
||||
packet-who.c \
|
||||
packet-wlancap.c \
|
||||
packet-wsp.c \
|
||||
packet-wtls.c \
|
||||
packet-wtp.c \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
## Makefile for building ethereal.exe with Microsoft C and nmake
|
||||
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
|
||||
#
|
||||
# $Id: Makefile.nmake,v 1.253 2002/11/04 12:10:59 sahlberg Exp $
|
||||
# $Id: Makefile.nmake,v 1.254 2002/11/06 21:49:29 guy Exp $
|
||||
|
||||
include config.nmake
|
||||
include <win32.mak>
|
||||
|
|
@ -306,6 +306,7 @@ DISSECTOR_SRC = \
|
|||
packet-wccp.c \
|
||||
packet-wcp.c \
|
||||
packet-who.c \
|
||||
packet-wlancap.c \
|
||||
packet-wsp.c \
|
||||
packet-wtls.c \
|
||||
packet-wtp.c \
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* packet.h
|
||||
* Definitions for packet disassembly structures and routines
|
||||
*
|
||||
* $Id: packet.h,v 1.63 2002/10/25 23:23:28 guy Exp $
|
||||
* $Id: packet.h,v 1.64 2002/11/06 21:49:32 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -46,7 +46,8 @@
|
|||
/* Check whether the "len" bytes of data starting at "offset" is
|
||||
* entirely inside the captured data for this packet. */
|
||||
#define BYTES_ARE_IN_FRAME(offset, captured_len, len) \
|
||||
((offset) + (len) <= (captured_len))
|
||||
((guint)(offset) + (guint)(len) > (guint)(offset) && \
|
||||
(guint)(offset) + (guint)(len) <= (guint)(captured_len))
|
||||
|
||||
/* To pass one of two strings, singular or plural */
|
||||
#define plurality(d,s,p) ((d) == 1 ? (s) : (p))
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright 2000, Axis Communications AB
|
||||
* Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
|
||||
*
|
||||
* $Id: packet-ieee80211.c,v 1.77 2002/10/31 20:46:00 guy Exp $
|
||||
* $Id: packet-ieee80211.c,v 1.78 2002/11/06 21:49:29 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1873,7 +1873,7 @@ wlan_defragment_init(void)
|
|||
}
|
||||
|
||||
void
|
||||
proto_register_wlan (void)
|
||||
proto_register_ieee80211 (void)
|
||||
{
|
||||
static const value_string frame_type[] = {
|
||||
{MGT_FRAME, "Management frame"},
|
||||
|
|
@ -2370,7 +2370,7 @@ proto_register_wlan (void)
|
|||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_wlan(void)
|
||||
proto_reg_handoff_ieee80211(void)
|
||||
{
|
||||
dissector_handle_t ieee80211_handle;
|
||||
dissector_handle_t ieee80211_radio_handle;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* By Tim Newsham
|
||||
*
|
||||
* $Id: packet-prism.c,v 1.8 2002/08/28 21:00:25 jmayer Exp $
|
||||
* $Id: packet-prism.c,v 1.9 2002/11/06 21:49:29 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -41,6 +41,7 @@
|
|||
#include <epan/packet.h>
|
||||
#include "packet-ieee80211.h"
|
||||
#include "packet-prism.h"
|
||||
#include "packet-wlancap.h"
|
||||
|
||||
/* protocol */
|
||||
static int proto_prism = -1;
|
||||
|
|
@ -80,18 +81,40 @@ VALFIELDS(frmlen);
|
|||
static gint ett_prism = -1;
|
||||
|
||||
static dissector_handle_t ieee80211_handle;
|
||||
static dissector_handle_t wlancap_handle;
|
||||
|
||||
void
|
||||
capture_prism(const guchar *pd, int offset, int len, packet_counts *ld)
|
||||
{
|
||||
if(!BYTES_ARE_IN_FRAME(offset, len, (int)sizeof(struct prism_hdr))) {
|
||||
ld->other ++;
|
||||
guint32 cookie = 0;
|
||||
guint32 length = 0;
|
||||
if (!BYTES_ARE_IN_FRAME(offset, len, sizeof(guint32) *2 )) {
|
||||
ld->other++;
|
||||
return;
|
||||
}
|
||||
offset += sizeof(struct prism_hdr);
|
||||
|
||||
cookie = pntohl(pd);
|
||||
length = pntohl(pd+sizeof(guint32));
|
||||
|
||||
/* Handle the new type of capture format */
|
||||
if (cookie == WLANCAP_MAGIC_COOKIE_V1) {
|
||||
if(!BYTES_ARE_IN_FRAME(offset, len, length)) {
|
||||
ld->other++;
|
||||
return;
|
||||
}
|
||||
offset += length;
|
||||
} else {
|
||||
/* We have an old capture format */
|
||||
if(!BYTES_ARE_IN_FRAME(offset, len, (int)sizeof(struct prism_hdr))) {
|
||||
ld->other++;
|
||||
return;
|
||||
}
|
||||
offset += sizeof(struct prism_hdr);
|
||||
}
|
||||
|
||||
/* 802.11 header follows */
|
||||
capture_ieee80211(pd, offset, len, ld);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -119,15 +142,24 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_item *ti;
|
||||
tvbuff_t *next_tvb;
|
||||
int offset;
|
||||
guint32 msgcode;
|
||||
|
||||
offset = 0;
|
||||
|
||||
/* handle the new capture type. */
|
||||
msgcode = tvb_get_ntohl(tvb, offset);
|
||||
if (msgcode == WLANCAP_MAGIC_COOKIE_V1) {
|
||||
call_dissector(wlancap_handle, tvb, pinfo, tree);
|
||||
return;
|
||||
}
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof hdr);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "Device: %.16s "
|
||||
"Message 0x%x, Length %d", hdr.devname,
|
||||
|
|
@ -202,6 +234,7 @@ proto_reg_handoff_prism(void)
|
|||
|
||||
/* handle for 802.11 dissector */
|
||||
ieee80211_handle = find_dissector("wlan");
|
||||
wlancap_handle = find_dissector("wlancap");
|
||||
|
||||
prism_handle = create_dissector_handle(dissect_prism, proto_prism);
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_PRISM_HEADER, prism_handle);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,280 @@
|
|||
/*
|
||||
* packet-wlancap.c
|
||||
* Decode packets with a AVS-WLAN header
|
||||
*
|
||||
* AVS linux-wlan-based products use a new sniff header to replace the
|
||||
* old prism2-specific one dissected in packet-prism2.c. This one has
|
||||
* additional fields, is designed to be non-hardware-specific, and more
|
||||
* importantly, version and length fields so it can be extended later
|
||||
* without breaking anything.
|
||||
*
|
||||
* By Solomon Peachy
|
||||
*
|
||||
* $Id: packet-wlancap.c,v 1.1 2002/11/06 21:49:29 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* Copied from README.developer
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <epan/packet.h>
|
||||
#include "packet-ieee80211.h"
|
||||
#include "packet-wlancap.h"
|
||||
|
||||
#define SHORT_STR 256
|
||||
|
||||
/* protocol */
|
||||
static int proto_wlancap = -1;
|
||||
|
||||
/* header attached during wlan monitor mode */
|
||||
struct wlan_header_v1 {
|
||||
guint32 version;
|
||||
guint32 length;
|
||||
guint64 mactime;
|
||||
guint64 hosttime;
|
||||
guint32 phytype;
|
||||
guint32 channel;
|
||||
guint32 datarate;
|
||||
guint32 antenna;
|
||||
guint32 priority;
|
||||
guint32 ssi_type;
|
||||
gint32 ssi_signal;
|
||||
gint32 ssi_noise;
|
||||
gint32 preamble;
|
||||
gint32 encoding;
|
||||
};
|
||||
|
||||
static int hf_wlan_version = -1;
|
||||
static int hf_wlan_length = -1;
|
||||
static int hf_wlan_mactime = -1;
|
||||
static int hf_wlan_hosttime = -1;
|
||||
static int hf_wlan_phytype = -1;
|
||||
static int hf_wlan_channel = -1;
|
||||
static int hf_wlan_datarate = -1;
|
||||
static int hf_wlan_antenna = -1;
|
||||
static int hf_wlan_priority = -1;
|
||||
static int hf_wlan_ssi_type = -1;
|
||||
static int hf_wlan_ssi_signal = -1;
|
||||
static int hf_wlan_ssi_noise = -1;
|
||||
static int hf_wlan_preamble = -1;
|
||||
static int hf_wlan_encoding = -1;
|
||||
|
||||
static gint ett_wlan = -1;
|
||||
|
||||
static dissector_handle_t ieee80211_handle;
|
||||
|
||||
static void
|
||||
dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
|
||||
|
||||
void
|
||||
capture_wlancap(const guchar *pd, int offset, int len, packet_counts *ld)
|
||||
{
|
||||
/* XXX eventually add in a version test. */
|
||||
if(!BYTES_ARE_IN_FRAME(offset, len, (int)sizeof(struct wlan_header_v1))) {
|
||||
ld->other ++;
|
||||
return;
|
||||
}
|
||||
offset += sizeof(struct wlan_header_v1);
|
||||
|
||||
/* 802.11 header follows */
|
||||
capture_ieee80211(pd, offset, len, ld);
|
||||
}
|
||||
|
||||
void
|
||||
proto_register_wlancap(void)
|
||||
{
|
||||
|
||||
static const value_string phy_type[] = {
|
||||
{ 0, "Unknown" },
|
||||
{ 1, "FHSS 802.11 '97" },
|
||||
{ 2, "DSSS 802.11 '97" },
|
||||
{ 3, "IR Baseband" },
|
||||
{ 4, "DSSS 802.11b" },
|
||||
{ 5, "PBCC 802.11b" },
|
||||
{ 6, "OFDM 802.11g" },
|
||||
{ 7, "PBCC 802.11g" },
|
||||
{ 8, "OFDM 802.11a" },
|
||||
};
|
||||
|
||||
static const value_string encoding_type[] = {
|
||||
{ 0, "Unknown" },
|
||||
{ 1, "CCK" },
|
||||
{ 2, "PBCC" },
|
||||
{ 3, "OFDM" },
|
||||
};
|
||||
|
||||
static const value_string ssi_type[] = {
|
||||
{ 0, "None" },
|
||||
{ 1, "Normalized RSSI" },
|
||||
{ 2, "dBm" },
|
||||
{ 3, "Raw RSSI" },
|
||||
};
|
||||
|
||||
static const value_string preamble_type[] = {
|
||||
{ 0, "Unknown" },
|
||||
{ 1, "Short" },
|
||||
{ 2, "Long" },
|
||||
};
|
||||
|
||||
static hf_register_info hf[] = {
|
||||
{ &hf_wlan_version, { "Header revision", "wlancap.version", FT_UINT32,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_length, { "Header length", "wlancap.length", FT_UINT32,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_mactime, { "MAC timestamp", "wlancap.mactime", FT_UINT64,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_hosttime, { "Host timestamp", "wlancap.hosttime", FT_UINT64,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_phytype, { "PHY type", "wlancap.phytype", FT_UINT32, BASE_DEC,
|
||||
VALS(phy_type), 0x0, "", HFILL } },
|
||||
{ &hf_wlan_channel, { "Channel", "wlancap.channel", FT_UINT32, BASE_DEC,
|
||||
NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_datarate, { "Data rate", "wlancap.datarate", FT_UINT32,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_antenna, { "Antenna", "wlancap.antenna", FT_UINT32, BASE_DEC,
|
||||
NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_priority, { "Priority", "wlancap.priority", FT_UINT32, BASE_DEC,
|
||||
NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_ssi_type, { "SSI Type", "wlancap.ssi_type", FT_UINT32, BASE_DEC,
|
||||
VALS(ssi_type), 0x0, "", HFILL } },
|
||||
{ &hf_wlan_ssi_signal, { "SSI Signal", "wlancap.ssi_signal", FT_UINT32,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_ssi_noise, { "SSI Noise", "wlancap.ssi_noise", FT_INT32,
|
||||
BASE_DEC, NULL, 0x0, "", HFILL } },
|
||||
{ &hf_wlan_preamble, { "Preamble", "wlancap.preamble", FT_UINT32,
|
||||
BASE_DEC, VALS(preamble_type), 0x0, "", HFILL } },
|
||||
{ &hf_wlan_encoding, { "Encoding Type", "wlancap.encoding", FT_UINT32,
|
||||
BASE_DEC, VALS(encoding_type), 0x0, "", HFILL } },
|
||||
};
|
||||
static gint *ett[] = {
|
||||
&ett_wlan
|
||||
};
|
||||
|
||||
proto_wlancap = proto_register_protocol("AVS WLAN Capture header", "AVS WLANCAP", "wlancap");
|
||||
proto_register_field_array(proto_wlancap, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
register_dissector("wlancap", dissect_wlancap, proto_wlancap);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
proto_tree *wlan_tree;
|
||||
proto_item *ti;
|
||||
tvbuff_t *next_tvb;
|
||||
int offset;
|
||||
guint32 version;
|
||||
guint32 length;
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
offset = 0;
|
||||
|
||||
version = tvb_get_ntohl(tvb, offset) - WLANCAP_MAGIC_COOKIE_BASE;
|
||||
length = tvb_get_ntohl(tvb, offset+4);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo, COL_INFO, "AVS WLAN Capture v%x, Length %d",version, length);
|
||||
|
||||
/* Dissect the packet */
|
||||
if (tree) {
|
||||
ti = proto_tree_add_protocol_format(tree, proto_wlancap,
|
||||
tvb, 0, length, "AVS WLAN Monitoring Header");
|
||||
wlan_tree = proto_item_add_subtree(ti, ett_wlan);
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_version, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset) - WLANCAP_MAGIC_COOKIE_BASE);
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_length, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
proto_tree_add_item(wlan_tree, hf_wlan_mactime, tvb, offset,
|
||||
8, FALSE);
|
||||
offset+=8;
|
||||
proto_tree_add_item(wlan_tree, hf_wlan_hosttime, tvb, offset,
|
||||
8, FALSE);
|
||||
offset+=8;
|
||||
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_phytype, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
/* XXX cook channel (fh uses different numbers) */
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_channel, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
|
||||
proto_tree_add_uint_format(wlan_tree, hf_wlan_datarate, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset) * 100,
|
||||
"Datarate: %d kbps",
|
||||
tvb_get_ntohl(tvb, offset) * 100);
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_antenna, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_priority, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_ssi_type, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
/* XXX cook ssi_signal (Based on type; ie format) */
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_ssi_signal, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
/* XXX cook ssi_noise (Based on type; ie format) */
|
||||
proto_tree_add_int(wlan_tree, hf_wlan_ssi_noise, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_preamble, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
proto_tree_add_uint(wlan_tree, hf_wlan_encoding, tvb, offset,
|
||||
4, tvb_get_ntohl(tvb, offset));
|
||||
offset+=4;
|
||||
}
|
||||
|
||||
if (offset == 0)
|
||||
offset = length;
|
||||
|
||||
/* dissect the 802.11 header next */
|
||||
next_tvb = tvb_new_subset(tvb, offset, -1, -1);
|
||||
call_dissector(ieee80211_handle, next_tvb, pinfo, tree);
|
||||
}
|
||||
|
||||
void
|
||||
proto_reg_handoff_wlancap(void)
|
||||
{
|
||||
dissector_handle_t wlancap_handle;
|
||||
|
||||
/* handle for 802.11 dissector */
|
||||
ieee80211_handle = find_dissector("wlan");
|
||||
|
||||
wlancap_handle = create_dissector_handle(dissect_wlancap, proto_wlancap);
|
||||
|
||||
dissector_add("wtap_encap", WTAP_ENCAP_WLAN_HEADER, wlancap_handle);
|
||||
}
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
/*
|
||||
* packet-wlancap.h
|
||||
* Declarations for packet-wlancap.c
|
||||
*
|
||||
* $Id: packet-wlancap.h,v 1.1 2002/11/06 21:49:29 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
* Copyright 1998 Gerald Combs
|
||||
*
|
||||
* Copied from README.developer
|
||||
*
|
||||
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
void capture_wlancap(const guchar *pd, int offset, int len, packet_counts *ld);
|
||||
void proto_register_wlancap(void);
|
||||
void proto_reg_handoff_wlancap(void);
|
||||
|
||||
#define WLANCAP_MAGIC_COOKIE_BASE 0x80211000
|
||||
#define WLANCAP_MAGIC_COOKIE_V1 0x80211001
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
/* wtap.c
|
||||
*
|
||||
* $Id: wtap.c,v 1.73 2002/10/31 07:12:42 guy Exp $
|
||||
* $Id: wtap.c,v 1.74 2002/11/06 21:49:34 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -148,6 +148,10 @@ static const struct encap_type_info {
|
|||
|
||||
/* WTAP_ENCAP_COSINE */
|
||||
{ "CoSine L2 debug log", "cosine" },
|
||||
|
||||
/* WTAP_ENCAP_WLAN_HEADER */
|
||||
{ "IEEE 802.11 plus AVS WLAN monitor header", "wlan" },
|
||||
|
||||
};
|
||||
|
||||
/* Name that should be somewhat descriptive. */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* wtap.h
|
||||
*
|
||||
* $Id: wtap.h,v 1.124 2002/10/31 07:12:42 guy Exp $
|
||||
* $Id: wtap.h,v 1.125 2002/11/06 21:49:34 guy Exp $
|
||||
*
|
||||
* Wiretap Library
|
||||
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
|
||||
|
|
@ -119,9 +119,10 @@
|
|||
#define WTAP_ENCAP_HHDLC 27
|
||||
#define WTAP_ENCAP_DOCSIS 28
|
||||
#define WTAP_ENCAP_COSINE 29
|
||||
#define WTAP_ENCAP_WLAN_HEADER 30
|
||||
|
||||
/* last WTAP_ENCAP_ value + 1 */
|
||||
#define WTAP_NUM_ENCAP_TYPES 30
|
||||
#define WTAP_NUM_ENCAP_TYPES 31
|
||||
|
||||
/* File types that can be read by wiretap.
|
||||
We support writing some many of these file types, too, so we
|
||||
|
|
|
|||
Loading…
Reference in New Issue