ppp: fix conflict for hf field

ccp.opt.oui' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT24

Change-Id: If6a3bbaf0012ab41722648a950f7b7007cf9a3b3
Reviewed-on: https://code.wireshark.org/review/20291
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 09004210d9c2ba029a20e24d1468fe9bd3e62f01..bfc17bfba50707b43cc6b8a0191b2706cf72209d 100644 (file)
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -3543,9 +3543,7 @@ static int dissect_ccp_oui_opt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
         return tvb_captured_length(tvb);
 
     oui = tvb_get_ntoh24(tvb, offset + 2);
-    ti = proto_tree_add_uint_format_value(field_tree, hf_ccp_opt_oui, tvb,
-        offset + 2, 3, oui, "%02x:%02x:%02x",
-        (oui >> 16) & 0xff, (oui >> 8) & 0xff, oui & 0xff);
+    ti = proto_tree_add_item(field_tree, hf_ccp_opt_oui, tvb, offset + 2, 3, ENC_NA);
     manuf = uint_get_manuf_name_if_known(oui);
     if (manuf)
         proto_item_append_text(ti, "(%s)", manuf);
@@ -7525,7 +7523,7 @@ proto_register_ccp(void)
             { "Length", "ccp.opt.length", FT_UINT8, BASE_DEC,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_ccp_opt_oui,
-            { "OUI", "ccp.opt.oui", FT_UINT24, BASE_HEX,
+            { "OUI", "ccp.opt.oui", FT_BYTES, SEP_COLON,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_ccp_opt_subtype,
             { "Subtype", "ccp.opt.subtype", FT_UINT8, BASE_DEC_HEX,