diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-03-23 01:02:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-03-23 01:02:41 +0000 |
| commit | 30b2831847d8caf376f2b40ae7849ceb4575848a (patch) | |
| tree | a145aeeb3846eafa53092f3c456bcff154867081 /wiretap | |
| parent | ac38f86c6965acca6d5a313119b37ed79038401f (diff) | |
Add support for DLT_APPLE_IP_OVER_IEEE_1394.
svn path=/trunk/; revision=10446
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 9 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 5 |
3 files changed, 13 insertions, 6 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 89fa2a69b7..e7cd0c278e 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.118 2004/03/19 05:22:41 guy Exp $ + * $Id: libpcap.c,v 1.119 2004/03/23 01:02:41 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -296,10 +296,13 @@ static const struct { /* * Values 130 through 137 are reserved for use in Juniper * hardware. - * - * 138 is reserved for Apple IP-over-IEEE 1394. */ + { 138, WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 }, + /* Apple IP-over-IEEE 1394 */ + + /* 139 is reserved for SS7 */ + { 140, WTAP_ENCAP_MTP2 }, { 141, WTAP_ENCAP_MTP3 }, { 143, WTAP_ENCAP_DOCSIS }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 82225d2b60..0496ca4da6 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.91 2004/03/11 09:18:33 guy Exp $ + * $Id: wtap.c,v 1.92 2004/03/23 01:02:41 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -244,6 +244,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_SYMANTEC */ { "Symantec Enterprise Firewall", "symantec" }, + + /* WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 */ + { "Apple IP-over-IEEE 1394", "ap1394" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 639b623e88..3398a9c698 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.153 2004/03/11 09:18:33 guy Exp $ + * $Id: wtap.h,v 1.154 2004/03/23 01:02:41 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -151,9 +151,10 @@ #define WTAP_ENCAP_USER14 59 #define WTAP_ENCAP_USER15 60 #define WTAP_ENCAP_SYMANTEC 61 +#define WTAP_ENCAP_APPLE_IP_OVER_IEEE1394 62 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 62 +#define WTAP_NUM_ENCAP_TYPES 63 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |