diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-28 07:11:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-28 07:11:11 +0000 |
| commit | 56636f157abdc8472bcf43de4837d5af2058de16 (patch) | |
| tree | bbe4c8fe37fb2677a6f3f3ab3313b96935381174 /wiretap/wtap.c | |
| parent | c0b335070c3b8156aed2bf2bf85110ddf9c8275e (diff) | |
| download | wireshark-56636f157abdc8472bcf43de4837d5af2058de16.tar.gz wireshark-56636f157abdc8472bcf43de4837d5af2058de16.tar.bz2 wireshark-56636f157abdc8472bcf43de4837d5af2058de16.zip | |
Support for 802.11+Prism II monitor-mode link-layer headers, from
Tim Newsham.
Add in missing item for WTAP_ENCAP_CISCO_IOS in the Wiretap
encapsulation type table.
svn path=/trunk/; revision=4290
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 8bd8ebdf7a..4cf4cba640 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.56 2001/11/13 23:55:44 gram Exp $ + * $Id: wtap.c,v 1.57 2001/11/28 07:11:10 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -124,6 +124,12 @@ static const struct encap_type_info { /* WTAP_ENCAP_CHDLC */ { "Cisco HDLC", "chdlc" }, + + /* WTAP_ENCAP_CISCO_IOS */ + { "Cisco IOS internal", "ios" }, + + /* WTAP_ENCAP_PRISM */ + { "IEEE 802.11 plus Prism II monitor mode header", "prism" }, }; /* Name that should be somewhat descriptive. */ |