diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-01 02:19:03 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-01 09:19:40 +0000 |
| commit | d55bb723e22675bfa65b8e2d7598aeaad34e9c5c (patch) | |
| tree | bc6a08e11df6bf2178beb49491789a07415f8bc4 /epan/dissectors/packet-lldp.c | |
| parent | 7c68a8e540399da07a8137e91b443039ab7ed73d (diff) | |
Just have one value_string table for OUIs.
While we're at it, get rid of duplicate #defines for some OUIs, sort the
OUI #defines, and fix some routine names.
Change-Id: I8f4e5408b44896c3629a0014299b060ebc15bab6
Reviewed-on: https://code.wireshark.org/review/1906
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-lldp.c')
| -rw-r--r-- | epan/dissectors/packet-lldp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index 0753ded38a..4126f9110f 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -3025,7 +3025,7 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre return tLength; } /* maintain previous OUI names. If not included, look in manuf database for OUI */ - ouiStr = val_to_str_const(oui, tlv_oui_subtype_vals, "Unknown"); + ouiStr = val_to_str_const(oui, oui_vals, "Unknown"); if (strcmp(ouiStr, "Unknown")==0) { ouiStr = uint_get_manuf_name_if_known(oui); if(ouiStr==NULL) ouiStr="Unknown"; @@ -3516,7 +3516,7 @@ proto_register_lldp(void) }, { &hf_org_spc_oui, { "Organization Unique Code", "lldp.orgtlv.oui", FT_UINT24, BASE_HEX, - VALS(tlv_oui_subtype_vals), 0x0, NULL, HFILL } + VALS(oui_vals), 0x0, NULL, HFILL } }, { &hf_dcbx_type, { "DCBx Protocol", "lldp.dcbx.proto", FT_UINT8, BASE_HEX, |