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-bootp.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-bootp.c')
| -rw-r--r-- | epan/dissectors/packet-bootp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 94240b2e57..5899e09d60 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -8520,7 +8520,7 @@ proto_register_bootp(void) { &hf_bootp_option125_tr111_device_manufacturer_oui, { "DeviceManufacturerOUI", "bootp.option.vi.tr111.device_manufacturer_oui", - FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, + FT_UINT24, BASE_OUI, NULL, 0x0, "Option 125:TR 111 1 DeviceManufacturerOUI", HFILL }}, { &hf_bootp_option125_tr111_device_serial_number, |