diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-30 07:14:22 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-30 07:14:22 +0000 |
| commit | a7bb49b0d967c759dccab991e3ab049495a39dfc (patch) | |
| tree | d2124c81f2ca7a0d8f1f849a1362bc8261966b4b /wiretap | |
| parent | 9161ba8e7f3fa9d8c59f5f7719625689a9867d6f (diff) | |
Add support for LocalTalk Link Access Protocol.
Rename WTAP_ENCAP_PRISM to WTAP_ENCAP_PRISM_HEADER, to match
DLT_PRISM_HEADER.
Add in missing capture support for WTAP_ENCAP_PRISM_HEADER when
capturing with "pcap_open_live()" rather than reading the capture from a
pipe.
svn path=/trunk/; revision=4299
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 6 | ||||
| -rw-r--r-- | wiretap/wtap.c | 7 | ||||
| -rw-r--r-- | wiretap/wtap.h | 7 |
3 files changed, 13 insertions, 7 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 19df0d8abb..88175f72f8 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.60 2001/11/28 07:11:10 guy Exp $ + * $Id: libpcap.c,v 1.61 2001/11/30 07:14:22 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -364,8 +364,10 @@ static const struct { */ { 113, WTAP_ENCAP_SLL }, /* Linux cooked capture */ + { 114, WTAP_ENCAP_LOCALTALK }, /* Localtalk */ + { 118, WTAP_ENCAP_CISCO_IOS }, - { 119, WTAP_ENCAP_PRISM }, /* Prism monitor mode hdr */ + { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */ }; #define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0]) diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 4cf4cba640..75f3f40326 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.57 2001/11/28 07:11:10 guy Exp $ + * $Id: wtap.c,v 1.58 2001/11/30 07:14:22 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -128,7 +128,10 @@ static const struct encap_type_info { /* WTAP_ENCAP_CISCO_IOS */ { "Cisco IOS internal", "ios" }, - /* WTAP_ENCAP_PRISM */ + /* WTAP_ENCAP_LOCALTALK */ + { "Localtalk", "ltalk" }, + + /* WTAP_ENCAP_PRISM_HEADER */ { "IEEE 802.11 plus Prism II monitor mode header", "prism" }, }; diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 2be3ff1bc5..6ea5c84f3d 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.95 2001/11/28 07:11:11 guy Exp $ + * $Id: wtap.h,v 1.96 2001/11/30 07:14:22 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -99,10 +99,11 @@ #define WTAP_ENCAP_FRELAY 20 #define WTAP_ENCAP_CHDLC 21 #define WTAP_ENCAP_CISCO_IOS 22 -#define WTAP_ENCAP_PRISM 23 +#define WTAP_ENCAP_LOCALTALK 23 +#define WTAP_ENCAP_PRISM_HEADER 24 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 24 +#define WTAP_NUM_ENCAP_TYPES 25 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |