diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2005-08-27 05:17:35 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2005-08-27 05:17:35 +0000 |
| commit | 9653fbb81b8af190f0d1592332b014610dc46c05 (patch) | |
| tree | 13fdfcd433e39732eb891706ec65bcea6fe734d3 | |
| parent | 3fd95d2433d62a6785c741a51ba950cdcba71698 (diff) | |
Add classification of an aironet proprietary L2 protocol
in both, Ethernet V2 and IEEE802.3 SNAP packets.
svn path=/trunk/; revision=15561
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-llc.c | 1 | ||||
| -rw-r--r-- | etypes.h | 4 | ||||
| -rw-r--r-- | oui.h | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index 0fcf0d1f1d..0d76c7186d 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -47,6 +47,7 @@ static dissector_handle_t data_handle; const value_string etype_vals[] = { {ETHERTYPE_IP, "IP" }, {ETHERTYPE_IPv6, "IPv6" }, + {ETHERTYPE_CISCOWL, "Cisco Wireless" }, {ETHERTYPE_CENTRINO_PROMISC, "IEEE 802.11 (Centrino promiscuous)" }, {ETHERTYPE_XNS_IDP, "XNS Internet Datagram Protocol" }, {ETHERTYPE_X25L3, "X.25 Layer 3" }, diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 637f8c04ab..59a9b524d5 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -182,6 +182,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r */ { OUI_CISCO, "Cisco" }, { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" }, + { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, { OUI_EXTREME, "Extreme Networks" }, { OUI_HP, "Hewlett-Packard" }, { OUI_NORTEL, "Nortel Networks SONMP" }, @@ -188,6 +188,10 @@ #define ETHERTYPE_IPv6 0x86dd #endif +#ifndef ETHERTYPE_CISCOWL +#define ETHERTYPE_CISCOWL 0x872d /* Cisco Wireless (Aironet) */ +#endif + #ifndef ETHERTYPE_MAC_CONTROL #define ETHERTYPE_MAC_CONTROL 0x8808 #endif @@ -30,6 +30,7 @@ #define OUI_CISCO 0x00000C /* Cisco (future use) */ #define OUI_NORTEL 0x000081 /* Nortel SONMP */ #define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */ +#define OUI_CISCOWL 0x004096 /* Cisco Wireless (Aironet) */ #define OUI_BRIDGED 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */ /* and Bridged ATM, RFC 2684 */ #define OUI_ATM_FORUM 0x00A03E /* ATM Forum */ |