diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2006-09-20 06:13:02 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2006-09-20 06:13:02 +0000 |
| commit | 06bdcadce01b1e684231458290ee96ee486152f2 (patch) | |
| tree | 6e36ea7d200403e38ea1c349b4b98ff61afee0eb /epan/oui.h | |
| parent | 958a945ca2625668ba4a0031806312028232f1ca (diff) | |
| download | wireshark-06bdcadce01b1e684231458290ee96ee486152f2.tar.gz | |
From David Pelton:
Add the ieee802a_add_oui function to libwireshark.def, and also adds the OUI that I am using to a couple of internal lists (in epan/oui.h and dissectors/packet-llc.c).
From me:
Resorted the oui lists, some witespace changes and added Ericsson OUI:s.
svn path=/trunk/; revision=19262
Diffstat (limited to 'epan/oui.h')
| -rw-r--r-- | epan/oui.h | 51 |
1 files changed, 38 insertions, 13 deletions
diff --git a/epan/oui.h b/epan/oui.h index 59bab2f6d9..db0ac06b2c 100644 --- a/epan/oui.h +++ b/epan/oui.h @@ -25,25 +25,50 @@ #ifndef __OUI_H__ #define __OUI_H__ +/* + * See + * + * http://standards.ieee.org/regauth/oui/oui.txt + * + * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/vlan.htm + * + * for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO. + */ + #define OUI_ENCAP_ETHER 0x000000 /* encapsulated Ethernet */ -#define OUI_XEROX 0x000006 /* Xerox */ -#define OUI_CISCO 0x00000C /* Cisco (future use) */ -#define OUI_NORTEL 0x000081 /* Nortel SONMP */ +#define OUI_XEROX 0x000006 /* Xerox */ +#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_ERICSSON 0x0001EC /* Ericsson Group */ +#define OUI_CATENA 0x00025A /* Catena Networks */ +#define OUI_SONY_ERICSSON 0x000AD9 /* Sony Ericsson Mobile Communications AB */ +#define OUI_SONY_ERICSSON_2 0x000E07 /* Sony Ericsson Mobile Communications AB */ +#define OUI_PROFINET 0x000ECF /* PROFIBUS Nutzerorganisation e.V. */ +#define OUI_SONY_ERICSSON_3 0x000FDE /* Sony Ericsson Mobile Communications AB */ +#define OUI_IEEE_802_3 0x00120F /* IEEE 802.3 */ +#define OUI_MEDIA_ENDPOINT 0x0012BB /* Media (TIA TR-41 Committee) */ +#define OUI_SONY_ERICSSON_4 0x0012EE /* Sony Ericsson Mobile Communications AB */ +#define OUI_ERICSSON_MOBILE 0x0015E0 /* Ericsson Mobile Platforms */ +#define OUI_SONY_ERICSSON_5 0x001620 /* Sony Ericsson Mobile Communications AB */ +#define OUI_SONY_ERICSSON_6 0x0016B8 /* Sony Ericsson Mobile Communications AB */ +#define OUI_SONY_ERICSSON_7 0x001813 /* Sony Ericsson Mobile Communications AB */ +#define OUI_SONY_ERICSSON_8 0x001963 /* Sony Ericsson Mobile Communications AB */ +#define OUI_CISCOWL 0x004096 /* Cisco Wireless (Aironet) */ +#define OUI_ERICSSON_2 0x008037 /* Ericsson Group */ +#define OUI_BRIDGED 0x0080C2 /* Bridged Frame-Relay, RFC 2427 */ + /* and Bridged ATM, RFC 2684 */ +#define OUI_IEEE_802_1 0x0080C2 /* IEEE 802.1 Committee */ #define OUI_ATM_FORUM 0x00A03E /* ATM Forum */ -#define OUI_EXTREME 0x00E02B /* Extreme EDP/ESRP */ +#define OUI_EXTREME 0x00E02B /* Extreme EDP/ESRP */ #define OUI_CABLE_BPDU 0x00E02F /* DOCSIS spanning tree BPDU */ -#define OUI_SIEMENS 0x080006 /* Siemens AG */ +#define OUI_SIEMENS 0x080006 /* Siemens AG */ #define OUI_APPLE_ATALK 0x080007 /* Appletalk */ -#define OUI_HP 0x080009 /* Hewlett-Packard */ -#define OUI_IEEE_802_1 0x0080C2 /* IEEE 802.1 Committee */ -#define OUI_IEEE_802_3 0x00120F /* IEEE 802.3 */ -#define OUI_MEDIA_ENDPOINT 0x0012BB /* Media (TIA TR-41 Committee) */ -#define OUI_PROFINET 0x000ECF /* PROFIBUS Nutzerorganisation e.V. */ +#define OUI_HP 0x080009 /* Hewlett-Packard */ +/* + * Defined in packet-llc.c + */ extern const value_string oui_vals[]; #endif |