osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Move value string of LLDP OUI to epan/oui.h 

Change-Id: I3d9ddbae60631c958880574e7e441a931db3492d
Reviewed-on: https://code.wireshark.org/review/1471
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Alexis La Goutte 2014-05-02 16:41:53 +02:00 committed by Evan Huus
parent 5f239013e7
commit b7d6055f2e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
epan/dissectors/packet-lldp.h
View File

@ -29,22 +29,6 @@
#include "oui.h"
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 }
};
/* TLV Types */
#define END_OF_LLDPDU_TLV_TYPE 0x00 /* Mandatory */
#define CHASSIS_ID_TLV_TYPE 0x01 /* Mandatory */

17
epan/oui.h
View File

@ -90,6 +90,23 @@
*/
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 }
};
#endif
/*