diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index a911472d4c..f6d69f5aed 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1550,6 +1550,7 @@ set(LIBWIRESHARK_FILES next_tvb.c oids.c osi-utils.c + oui.c packet-range.c packet.c print.c diff --git a/epan/Makefile.common b/epan/Makefile.common index 1f41b6d9db..f5991c91f7 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -66,6 +66,7 @@ LIBWIRESHARK_SRC = \ next_tvb.c \ oids.c \ osi-utils.c \ + oui.c \ packet-range.c \ packet.c \ prefs.c \ diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 87e3002150..856536f122 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -179,61 +179,6 @@ const value_string sap_vals[] = { { 0x00, NULL } }; -/* - * 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. - */ -const value_string oui_vals[] = { - { OUI_ENCAP_ETHER, "Encapsulated Ethernet" }, - { OUI_XEROX, "Xerox" }, -/* -http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm -*/ - { OUI_CISCO, "Cisco" }, - { OUI_NORTEL, "Nortel Discovery Protocol" }, - { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" }, - { OUI_FORCE10, "Force10 Networks" }, - { OUI_ERICSSON, "Ericsson Group" }, - { OUI_CATENA, "Catena Networks" }, - { OUI_SONY_ERICSSON, "Sony Ericsson Mobile Communications AB" }, - { OUI_SONY_ERICSSON_2, "Sony Ericsson Mobile Communications AB" }, - { OUI_PROFINET, "PROFIBUS Nutzerorganisation e.V." }, - { OUI_SONY_ERICSSON_3, "Sony Ericsson Mobile Communications AB" }, - { OUI_CIMETRICS, "Cimetrics" }, - { OUI_IEEE_802_3, "IEEE 802.3" }, - { OUI_MEDIA_ENDPOINT, "Media (TIA TR-41 Committee)" }, - { OUI_SONY_ERICSSON_4, "Sony Ericsson Mobile Communications AB" }, - { OUI_ERICSSON_MOBILE, "Ericsson Mobile Platforms" }, - { OUI_SONY_ERICSSON_5, "Sony Ericsson Mobile Communications AB" }, - { OUI_SONY_ERICSSON_6, "Sony Ericsson Mobile Communications AB" }, - { OUI_SONY_ERICSSON_7, "Sony Ericsson Mobile Communications AB" }, - { OUI_BLUETOOTH, "Bluetooth SIG, Inc." }, - { OUI_SONY_ERICSSON_8, "Sony Ericsson Mobile Communications AB" }, - { OUI_IEEE_802_1QBG, "IEEE 802.1Qbg" }, - { OUI_TURBOCELL, "Karlnet (Turbocell)" }, - { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, - { OUI_MARVELL, "Marvell Semiconductor" }, - { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, - { OUI_IEEE_802_1, "IEEE 802.1 Committee" }, - { OUI_ATM_FORUM, "ATM Forum" }, - { OUI_EXTREME, "Extreme Networks" }, - /* RFC 2427, RFC 2684 */ - { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */ - { OUI_SIEMENS, "Siemens AG" }, - { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, - { OUI_HP, "Hewlett-Packard" }, - { OUI_HP_2, "Hewlett-Packard" }, - /* Registry Name: PPP Vendor Specific OUI Options */ - { OUI_3GPP2, "3GPP2 Vendor specific packet ID" }, - { OUI_ERICSSON_2, "Ericsson Group" }, - { 0, NULL } -}; - static const value_string format_vals[] = { { 0x81, "LLC basic format" }, { 0, NULL } diff --git a/epan/oui.c b/epan/oui.c new file mode 100644 index 0000000000..dfd24aede4 --- /dev/null +++ b/epan/oui.c @@ -0,0 +1,98 @@ +/* oui.c + * Routines and tables for processing OUIs + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 - 2000 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include +#include + +/* + * 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. + */ +const value_string oui_vals[] = { + { OUI_ENCAP_ETHER, "Encapsulated Ethernet" }, + { OUI_XEROX, "Xerox" }, +/* +http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm +*/ + { OUI_CISCO, "Cisco" }, + { OUI_NORTEL, "Nortel Discovery Protocol" }, + { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" }, + { OUI_FORCE10, "Force10 Networks" }, + { OUI_ERICSSON, "Ericsson Group" }, + { OUI_CATENA, "Catena Networks" }, + { OUI_SONY_ERICSSON, "Sony Ericsson Mobile Communications AB" }, + { OUI_SONY_ERICSSON_2, "Sony Ericsson Mobile Communications AB" }, + { OUI_PROFINET, "PROFIBUS Nutzerorganisation e.V." }, + { OUI_SONY_ERICSSON_3, "Sony Ericsson Mobile Communications AB" }, + { OUI_CIMETRICS, "Cimetrics" }, + { OUI_IEEE_802_3, "IEEE 802.3" }, + { OUI_MEDIA_ENDPOINT, "Media (TIA TR-41 Committee)" }, + { OUI_SONY_ERICSSON_4, "Sony Ericsson Mobile Communications AB" }, + { OUI_ERICSSON_MOBILE, "Ericsson Mobile Platforms" }, + { OUI_SONY_ERICSSON_5, "Sony Ericsson Mobile Communications AB" }, + { OUI_SONY_ERICSSON_6, "Sony Ericsson Mobile Communications AB" }, + { OUI_SONY_ERICSSON_7, "Sony Ericsson Mobile Communications AB" }, + { OUI_BLUETOOTH, "Bluetooth SIG, Inc." }, + { OUI_SONY_ERICSSON_8, "Sony Ericsson Mobile Communications AB" }, + { OUI_IEEE_802_1QBG, "IEEE 802.1Qbg" }, + { OUI_TURBOCELL, "Karlnet (Turbocell)" }, + { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, + { OUI_MARVELL, "Marvell Semiconductor" }, + { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, + { OUI_IEEE_802_1, "IEEE 802.1 Committee" }, + { OUI_ATM_FORUM, "ATM Forum" }, + { OUI_EXTREME, "Extreme Networks" }, + /* RFC 2427, RFC 2684 */ + { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */ + { OUI_SIEMENS, "Siemens AG" }, + { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, + { OUI_HP, "Hewlett-Packard" }, + { OUI_HP_2, "Hewlett-Packard" }, + /* Registry Name: PPP Vendor Specific OUI Options */ + { OUI_3GPP2, "3GPP2 Vendor specific packet ID" }, + { OUI_ERICSSON_2, "Ericsson Group" }, + { 0, NULL } +}; + +const value_string tlv_oui_subtype_vals[] = { + /* Currently, the manuf file calls this "Ieee8021"; "IEEE 802.1" looks better */ + { OUI_IEEE_802_1, "IEEE 802.1" }, + /* Currently, the manuf file calls this "Ieee8023"; "IEEE 802.3" looks better */ + { OUI_IEEE_802_3, "IEEE 802.3" }, + /* Currently, the manuf file calls this "Telecomm"; "TIA TR-41 Committee" looks better */ + { OUI_MEDIA_ENDPOINT, "TIA TR-41 Committee" }, + /* Currently, the manuf file calls this "Profibus" */ + { OUI_PROFINET, "PROFINET" }, + /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */ + { OUI_IEEE_802_1QBG, "IEEE 802.1Qbg" }, + /* Data Center Bridging Exchange */ + { OUI_DCBX, "Data Center Bridging Capabilities Exchange" }, + { 0, NULL } +}; + diff --git a/epan/oui.h b/epan/oui.h index bae839fe01..b479aad07a 100644 --- a/epan/oui.h +++ b/epan/oui.h @@ -85,27 +85,9 @@ #define OUI_RSN 0x000FAC /* Wi-Fi : RSN */ #define OUI_PRE11N 0x00904C /* Wi-Fi : 802.11 Pre-N */ -/* - * Defined in packet-llc.c - */ extern const value_string oui_vals[]; - -static const value_string tlv_oui_subtype_vals[] = { - /* Currently, the manuf file calls this "Ieee8021"; "IEEE 802.1" looks better */ - { OUI_IEEE_802_1, "IEEE 802.1" }, - /* Currently, the manuf file calls this "Ieee8023"; "IEEE 802.3" looks better */ - { OUI_IEEE_802_3, "IEEE 802.3" }, - /* Currently, the manuf file calls this "Telecomm"; "TIA TR-41 Committee" looks better */ - { OUI_MEDIA_ENDPOINT, "TIA TR-41 Committee" }, - /* Currently, the manuf file calls this "Profibus" */ - { OUI_PROFINET, "PROFINET" }, - /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */ - { OUI_IEEE_802_1QBG, "IEEE 802.1Qbg" }, - /* Data Center Bridging Exchange */ - { OUI_DCBX, "Data Center Bridging Capabilities Exchange" }, - { 0, NULL } -}; +extern const value_string tlv_oui_subtype_vals[]; #endif