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

From Jeff Morriss: add support for libpcap MTP2 and MTP3 captures. 

Add a missing entry in "encap_table[]" for Bluetooth H4, and fix some
comments.

svn path=/trunk/; revision=9157
This commit is contained in:
Guy Harris 2003-12-03 22:40:39 +00:00
parent 6fed1581eb
commit 02260b4056
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wiretap/AUTHORS
View File

@ -22,3 +22,4 @@ Jesper Peterson <jesper[AT]endace.com>
Marcel Holtmann <marcel[AT]holtmann.org>
Scott Emberley <scotte[AT]netinst.com>
Martijn Schipper <mschipper[AT]globespanvirata.com>
Jeff Morriss <jeff.morriss[AT]ulticom.com>

5
wiretap/libpcap.c
View File

@ -1,6 +1,6 @@
/* libpcap.c
*
* $Id: libpcap.c,v 1.100 2003/10/24 23:55:34 guy Exp $
* $Id: libpcap.c,v 1.101 2003/12/03 22:40:39 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -261,6 +261,9 @@ static const struct {
* 138 is reserved for Apple IP-over-IEEE 1394.
*/
{ 140, WTAP_ENCAP_MTP2 },
{ 141, WTAP_ENCAP_MTP3 },
/*
* To repeat:
*

15
wiretap/wtap.c
View File

@ -1,6 +1,6 @@
/* wtap.c
*
* $Id: wtap.c,v 1.84 2003/10/25 07:17:28 guy Exp $
* $Id: wtap.c,v 1.85 2003/12/03 22:40:39 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -65,7 +65,7 @@ static const struct encap_type_info {
/* WTAP_ENCAP_ETHERNET */
{ "Ethernet", "ether" },
/* WTAP_ENCAP_TR */
/* WTAP_ENCAP_TOKEN_RING */
{ "Token Ring", "tr" },
/* WTAP_ENCAP_SLIP */
@ -146,7 +146,7 @@ static const struct encap_type_info {
/* WTAP_ENCAP_PRISM_HEADER */
{ "IEEE 802.11 plus Prism II monitor mode header", "prism" },
/* WTAP_ENCAP_PFLOG */
/* WTAP_ENCAP_OLD_PFLOG */
{ "OpenBSD PF Firewall logs, pre-3.4", "pflog-old" },
/* WTAP_ENCAP_HHDLC */
@ -178,6 +178,15 @@ static const struct encap_type_info {
/* WTAP_ENCAP_CHDLC_WITH_PHDR */
{ "Cisco HDLC with Directional Info", "chdlc-with-direction" },
/* WTAP_ENCAP_BLUETOOTH_H4 */
{ "Bluetooth H4", "bluetooth-h4" },
/* WTAP_ENCAP_MTP2 */
{ "SS7 MTP2", "mtp2" },
/* WTAP_ENCAP_MTP3 */
{ "SS7 MTP3", "mtp3" },
};
/* Name that should be somewhat descriptive. */

6
wiretap/wtap.h
View File

@ -1,6 +1,6 @@
/* wtap.h
*
* $Id: wtap.h,v 1.145 2003/12/02 19:37:05 guy Exp $
* $Id: wtap.h,v 1.146 2003/12/03 22:40:39 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -130,9 +130,11 @@
#define WTAP_ENCAP_PFLOG 38
#define WTAP_ENCAP_CHDLC_WITH_PHDR 39
#define WTAP_ENCAP_BLUETOOTH_H4 40
#define WTAP_ENCAP_MTP2 41
#define WTAP_ENCAP_MTP3 42
/* last WTAP_ENCAP_ value + 1 */
#define WTAP_NUM_ENCAP_TYPES 41
#define WTAP_NUM_ENCAP_TYPES 43
/* File types that can be read by wiretap.
We support writing some many of these file types, too, so we