diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-10-21 00:00:46 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-10-21 08:22:30 +0000 |
| commit | b289699ace2075c934f7009dea307156f9296071 (patch) | |
| tree | 9dd26c3201917226ec2bb26220c943fa12b60f63 /epan/dissectors/packet-ecp-oui.c | |
| parent | 0f868cfeb0260fc30f8fe0710312102dac6972fd (diff) | |
Remove oui_vals value_string and epan/oui.c
oui.c is a very small subset of what comes from http://standards.ieee.org/regauth/oui/oui.txt,
so use the "full" OUI list (and more) out of the manuf file and convert
hf_ fields to just use BASE_OUI.
Change-Id: Ic0c2ff618d8a6212f498e3b7475e0a7856c22b5b
Reviewed-on: https://code.wireshark.org/review/24007
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ecp-oui.c')
| -rw-r--r-- | epan/dissectors/packet-ecp-oui.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c index 43566edef8..0677bd6cc4 100644 --- a/epan/dissectors/packet-ecp-oui.c +++ b/epan/dissectors/packet-ecp-oui.c @@ -28,6 +28,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/oui.h> +#include <epan/addr_resolv.h> #include <wsutil/str_util.h> @@ -208,12 +209,9 @@ dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree tempOffset += 2; 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, oui_vals, "Unknown"); - if (strcmp(ouiStr, "Unknown")==0) { - ouiStr = uint_get_manuf_name_if_known(oui); - if(ouiStr==NULL) ouiStr="Unknown"; - } + /* Look in manuf database for OUI */ + ouiStr = uint_get_manuf_name_if_known(oui); + if(ouiStr==NULL) ouiStr="Unknown"; tempOffset += 3; @@ -385,8 +383,8 @@ void proto_register_ecp_oui(void) }, #if 0 { &hf_ecp_vdp_oui, - { "Organization Unique Code", "ecp.vdp.oui", FT_UINT24, BASE_HEX, - VALS(oui_vals), 0x0, NULL, HFILL } + { "Organization Unique Code", "ecp.vdp.oui", FT_UINT24, BASE_OUI, + NULL, 0x0, NULL, HFILL } }, #endif { &hf_ecp_vdp_mode, |