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-ecp-oui.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-ecp-oui.c')
| -rw-r--r-- | epan/dissectors/packet-ecp-oui.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 00869d215d..6e4fee6d9b 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -199,9 +199,9 @@ dissect_vdp_fi_macvid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, g return tempOffset-offset; } -/* Dissect VDP TLVs */ +/* Dissect Organizationally Defined TLVs */ static gint32 -dissect_vdp_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset) +dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset) { guint16 tempLen; guint16 len; @@ -223,7 +223,7 @@ dissect_vdp_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 oui = tvb_get_ntoh24(tvb, (tempOffset)); /* 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"; @@ -296,7 +296,7 @@ dissect_vdp_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 /* Dissect End of VDP TLV (Mandatory) */ gint32 -dissect_vdp_end_of_vdpdu(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset) +dissect_vdp_end_of_vdpdu_tlv(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint32 offset) { guint16 tempLen; guint16 tempShort; @@ -356,10 +356,10 @@ dissect_ecp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch (tempType) { case ORG_SPECIFIC_TLV_TYPE: - tempLen = dissect_vdp_tlv(tvb, pinfo, ecp_tree, offset); + tempLen = dissect_vdp_org_specific_tlv(tvb, pinfo, ecp_tree, offset); break; case END_OF_VDPDU_TLV_TYPE: - tempLen = dissect_vdp_end_of_vdpdu(tvb, pinfo, ecp_tree, offset); + tempLen = dissect_vdp_end_of_vdpdu_tlv(tvb, pinfo, ecp_tree, offset); break; default: tempLen = dissect_ecp_unknown_tlv(tvb, pinfo, ecp_tree, offset); @@ -407,7 +407,7 @@ void proto_register_ecp_oui(void) #if 0 { &hf_ecp_vdp_oui, { "Organization Unique Code", "ecp.vdp.oui", FT_UINT24, BASE_HEX, - VALS(tlv_oui_subtype_vals), 0x0, NULL, HFILL } + VALS(oui_vals), 0x0, NULL, HFILL } }, #endif { &hf_ecp_vdp_mode, |