osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Tomas Kukosa: reserve private WTAP_ENCAP values and map them to 

reserved private DLT_ values.

svn path=/trunk/; revision=9892
This commit is contained in:
Guy Harris 2004-01-28 01:24:30 +00:00
parent bd0c381cfd
commit 677db2dadd
3 changed files with 86 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wiretap/libpcap.c
View File

@ -1,6 +1,6 @@
/* libpcap.c
*
* $Id: libpcap.c,v 1.109 2004/01/27 08:06:12 guy Exp $
* $Id: libpcap.c,v 1.110 2004/01/28 01:24:29 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -288,6 +288,24 @@ static const struct {
{ 143, WTAP_ENCAP_DOCSIS },
/* Reserved for private use. */
{ 147, WTAP_ENCAP_USER0 },
{ 148, WTAP_ENCAP_USER1 },
{ 149, WTAP_ENCAP_USER2 },
{ 150, WTAP_ENCAP_USER3 },
{ 151, WTAP_ENCAP_USER4 },
{ 152, WTAP_ENCAP_USER5 },
{ 153, WTAP_ENCAP_USER6 },
{ 154, WTAP_ENCAP_USER7 },
{ 155, WTAP_ENCAP_USER8 },
{ 156, WTAP_ENCAP_USER9 },
{ 157, WTAP_ENCAP_USER10 },
{ 158, WTAP_ENCAP_USER11 },
{ 159, WTAP_ENCAP_USER12 },
{ 160, WTAP_ENCAP_USER13 },
{ 161, WTAP_ENCAP_USER14 },
{ 162, WTAP_ENCAP_USER15 },
/*
* To repeat:
*

50
wiretap/wtap.c
View File

@ -1,6 +1,6 @@
/* wtap.c
*
* $Id: wtap.c,v 1.87 2004/01/25 21:55:17 guy Exp $
* $Id: wtap.c,v 1.88 2004/01/28 01:24:29 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -190,6 +190,54 @@ static const struct encap_type_info {
/* WTAP_ENCAP_IRDA */
{ "IrDA", "irda" },
/* WTAP_ENCAP_USER0 */
{ "USER 0", "user0" },
/* WTAP_ENCAP_USER1 */
{ "USER 1", "user1" },
/* WTAP_ENCAP_USER2 */
{ "USER 2", "user2" },
/* WTAP_ENCAP_USER3 */
{ "USER 3", "user3" },
/* WTAP_ENCAP_USER4 */
{ "USER 4", "user4" },
/* WTAP_ENCAP_USER5 */
{ "USER 5", "user5" },
/* WTAP_ENCAP_USER6 */
{ "USER 6", "user6" },
/* WTAP_ENCAP_USER7 */
{ "USER 7", "user7" },
/* WTAP_ENCAP_USER8 */
{ "USER 8", "user8" },
/* WTAP_ENCAP_USER9 */
{ "USER 9", "user9" },
/* WTAP_ENCAP_USER10 */
{ "USER 10", "user10" },
/* WTAP_ENCAP_USER11 */
{ "USER 11", "user11" },
/* WTAP_ENCAP_USER12 */
{ "USER 12", "user12" },
/* WTAP_ENCAP_USER13 */
{ "USER 13", "user13" },
/* WTAP_ENCAP_USER14 */
{ "USER 14", "user14" },
/* WTAP_ENCAP_USER15 */
{ "USER 15", "user15" },
};
/* Name that should be somewhat descriptive. */

20
wiretap/wtap.h
View File

@ -1,6 +1,6 @@
/* wtap.h
*
* $Id: wtap.h,v 1.149 2004/01/27 08:06:12 guy Exp $
* $Id: wtap.h,v 1.150 2004/01/28 01:24:30 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@ -133,9 +133,25 @@
#define WTAP_ENCAP_MTP2 41
#define WTAP_ENCAP_MTP3 42
#define WTAP_ENCAP_IRDA 43
#define WTAP_ENCAP_USER0 44
#define WTAP_ENCAP_USER1 45
#define WTAP_ENCAP_USER2 46
#define WTAP_ENCAP_USER3 47
#define WTAP_ENCAP_USER4 48
#define WTAP_ENCAP_USER5 49
#define WTAP_ENCAP_USER6 50
#define WTAP_ENCAP_USER7 51
#define WTAP_ENCAP_USER8 52
#define WTAP_ENCAP_USER9 53
#define WTAP_ENCAP_USER10 54
#define WTAP_ENCAP_USER11 55
#define WTAP_ENCAP_USER12 56
#define WTAP_ENCAP_USER13 57
#define WTAP_ENCAP_USER14 58
#define WTAP_ENCAP_USER15 59
/* last WTAP_ENCAP_ value + 1 */
#define WTAP_NUM_ENCAP_TYPES 44
#define WTAP_NUM_ENCAP_TYPES 60
/* File types that can be read by wiretap.
We support writing some many of these file types, too, so we