diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-22 21:49:50 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2000-01-22 21:49:50 +0000 |
| commit | 02e20af37c3ca0af72d23974424291f760283843 (patch) | |
| tree | 51c9c328d8d55db7474dd3e1d3d578b69cbd42f4 /oui.h | |
| parent | 3d0f744d9fa3eeb22526b1fd8f2d167c0953bb44 (diff) | |
Merge Paul Ionescu's CDP fixes with Guy's. Add #defines to oui.h for Cisco
IOS 9.0 and bridged frame relay and update packet-llc.c accordingly. Add
CDP handler to capture_llc() in packet-llc.c.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1524 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'oui.h')
| -rw-r--r-- | oui.h | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -2,11 +2,11 @@ * Definitions of OUIs * Gilbert Ramirez <gramirez@tivoli.com> * - * $Id: oui.h,v 1.3 2000/01/12 19:37:24 guy Exp $ + * $Id: oui.h,v 1.4 2000/01/22 21:49:50 gerald Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> - * Copyright 1998 Gerald Combs + * Copyright 1998 - 2000 Gerald Combs * * * This program is free software; you can redistribute it and/or @@ -25,7 +25,9 @@ */ #define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */ -#define OUI_CISCO 0x00000C /* Cisco */ +#define OUI_CISCO 0x00000C /* Cisco (future use) */ +#define OUI_CISCO_90 0x0000F8 /* Cisco (IOS 9.0 and above?) */ +#define OUI_BFR 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */ #define OUI_ATM_FORUM 0x00A03E /* ATM Forum */ #define OUI_APPLE_ATALK 0x080007 /* Appletalk */ |