diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-02 03:04:12 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-02 03:04:12 +0000 |
| commit | b2ab758ca7601c28cf35a6b4c5a46c157da2ea4e (patch) | |
| tree | 3e1d33da3998008f73b9c30f84b556b007b04116 | |
| parent | 78d7c0ca28b4686bb974ac3bc23f2afc04ef85ff (diff) | |
The Cisco 802.11 bridges used 0000F8, i.e. OUI_CISCO_90, not 000078;
various Cisco documents indicate that 0000F8 is used on at least some
Cisco boxes for bridging Ethernet frames onto 802.x+LLC frames.
svn path=/trunk/; revision=3498
| -rw-r--r-- | oui.h | 3 | ||||
| -rw-r--r-- | packet-llc.c | 19 |
2 files changed, 6 insertions, 16 deletions
@@ -2,7 +2,7 @@ * Definitions of OUIs * Gilbert Ramirez <gram@xiexie.org> * - * $Id: oui.h,v 1.9 2001/06/01 23:04:37 guy Exp $ + * $Id: oui.h,v 1.10 2001/06/02 03:04:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -29,7 +29,6 @@ #define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */ #define OUI_CISCO 0x00000C /* Cisco (future use) */ -#define OUI_CISCO_WLANB 0x000078 /* Cisco WLAN bridged packets? */ #define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */ #define OUI_BRIDGED 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */ /* and Bridged ATM, RFC 2684 */ diff --git a/packet-llc.c b/packet-llc.c index 132be4192c..b911247562 100644 --- a/packet-llc.c +++ b/packet-llc.c @@ -2,7 +2,7 @@ * Routines for IEEE 802.2 LLC layer * Gilbert Ramirez <gram@xiexie.org> * - * $Id: packet-llc.c,v 1.85 2001/06/01 23:04:37 guy Exp $ + * $Id: packet-llc.c,v 1.86 2001/06/02 03:04:12 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -166,7 +166,6 @@ 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_CISCO_WLANB, "Cisco 802.11 bridge" }, { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, /* RFC 2427, RFC 2684 */ { OUI_ATM_FORUM, "ATM Forum" }, @@ -231,7 +230,7 @@ capture_llc(const u_char *pd, int offset, packet_counts *ld) { switch (oui) { case OUI_ENCAP_ETHER: - case OUI_CISCO_WLANB: + case OUI_CISCO_90: case OUI_APPLE_ATALK: /* No, I have no idea why Apple used one of their own OUIs, rather than @@ -239,11 +238,7 @@ capture_llc(const u_char *pd, int offset, packet_counts *ld) { packet type as protocol ID, for AppleTalk data packets - but used OUI_ENCAP_ETHER and an Ethernet - packet type for AARP packets. - - Also, apparently, some Cisco 802.11 - bridges change the OUI of packets - from 000000 to 000078. */ + packet type for AARP packets. */ capture_ethertype(etype, offset+8, pd, ld); break; @@ -389,7 +384,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, switch (oui) { case OUI_ENCAP_ETHER: - case OUI_CISCO_WLANB: + case OUI_CISCO_90: case OUI_APPLE_ATALK: /* No, I have no idea why Apple used one of their own OUIs, rather than @@ -397,11 +392,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, packet type as protocol ID, for AppleTalk data packets - but used OUI_ENCAP_ETHER and an Ethernet - packet type for AARP packets. - - Also, apparently, some Cisco 802.11 - bridges change the OUI of packets - from 000000 to 000078. */ + packet type for AARP packets. */ if (XDLC_IS_INFORMATION(control)) { ethertype(etype, tvb, offset+5, pinfo, tree, snap_tree, hf_type, -1); |