Eliminate proto_tree_add_text from some dissectors.

Other minor cleanup while in the area.

Change-Id: Id8d957d3d68a2e3dd5089f490bd59d773e1be967
Reviewed-on: https://code.wireshark.org/review/3427
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 28 insertions, 17 deletions

diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index cf3bb80092..9e9d8e4728 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -73,6 +73,7 @@ static int hf_eap_leap_peer_challenge = -1;
 static int hf_eap_leap_peer_response = -1;
 static int hf_eap_leap_ap_challenge = -1;
 static int hf_eap_leap_ap_response = -1;
+static int hf_eap_leap_data = -1;
 static int hf_eap_leap_name = -1;
 
 static int hf_eap_ms_chap_v2_opcode = -1;
@@ -85,8 +86,11 @@ static int hf_eap_ms_chap_v2_peer_challenge = -1;
 static int hf_eap_ms_chap_v2_reserved = -1;
 static int hf_eap_ms_chap_v2_nt_response = -1;
 static int hf_eap_ms_chap_v2_flags = -1;
+static int hf_eap_ms_chap_v2_response = -1;
 static int hf_eap_ms_chap_v2_message = -1;
 static int hf_eap_ms_chap_v2_failure_request = -1;
+static int hf_eap_ms_chap_v2_data = -1;
+static int hf_eap_data = -1;
 
 static gint ett_eap = -1;
 
@@ -494,9 +498,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in
       offset += 1;
       left   -= value_size;
     } else {
-      proto_tree_add_text(eap_tree, tvb, offset, value_size,
-              "EAP-MS-CHAP-v2 Response (Unknown Length): %s",
-              tvb_bytes_to_ep_str(tvb, offset, value_size));
+      proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_response, tvb, offset, value_size, ENC_NA);
       offset += value_size;
       left   -= value_size;
     }
@@ -517,10 +519,7 @@ dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, in
                             tvb, offset, left, ENC_ASCII|ENC_NA);
     break;
   default:
-    proto_tree_add_text(eap_tree, tvb, offset, left,
-            "EAP-MS-CHAP-v2 Data (%d byte%s): \"%s\"",
-            left, plurality(left, "", "s"),
-            tvb_bytes_to_ep_str(tvb, offset, left));
+    proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_data, tvb, offset, left, ENC_NA);
     break;
   }
 }
@@ -1127,10 +1126,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
             break;
 
           default:
-            proto_tree_add_text(eap_tree, tvb, offset, count,
-                                "EAP-LEAP Data (%d byte%s): \"%s\"",
-                                count, plurality(count, "", "s"),
-                                tvb_bytes_to_ep_str(tvb, offset, count));
+            proto_tree_add_item(eap_tree, hf_eap_leap_data, tvb, offset, count, ENC_NA);
             break;
           }
         }
@@ -1185,12 +1181,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
       /*********************************************************************
       **********************************************************************/
       default:
-        if (tree) {
-          proto_tree_add_text(eap_tree, tvb, offset, size,
-                              "EAP Data (%d byte%s): \"%s\"",
-                              size, plurality(size, "", "s"),
-                              tvb_bytes_to_ep_str(tvb, offset, size));
-        }
+        proto_tree_add_item(eap_tree, hf_eap_data, tvb, offset, size, ENC_NA);
         break;
         /*********************************************************************
         **********************************************************************/
@@ -1427,6 +1418,11 @@ proto_register_eap(void)
       FT_BYTES, BASE_NONE, NULL, 0x0,
       NULL, HFILL }},
 
+    { &hf_eap_leap_data, {
+      "EAP-LEAP Data", "eap.leap.data",
+      FT_BYTES, BASE_NONE, NULL, 0x0,
+      NULL, HFILL }},
+
     { &hf_eap_leap_name, {
       "EAP-LEAP Name", "eap.leap.name",
       FT_STRING, BASE_NONE, NULL, 0x0,
@@ -1482,6 +1478,11 @@ proto_register_eap(void)
       FT_UINT8, BASE_HEX, NULL, 0x0,
       NULL, HFILL }},
 
+    { &hf_eap_ms_chap_v2_response, {
+      "EAP-MS-CHAP-v2 Response (Unknown Length)", "eap.ms_chap_v2.response",
+      FT_BYTES, BASE_NONE, NULL, 0x0,
+      NULL, HFILL }},
+
     { &hf_eap_ms_chap_v2_message, {
       "EAP-MS-CHAP-v2 Message", "eap.ms_chap_v2.message",
       FT_STRING, BASE_NONE, NULL, 0x0,
@@ -1492,6 +1493,16 @@ proto_register_eap(void)
       FT_STRING, BASE_NONE, NULL, 0x0,
       NULL, HFILL }},
 
+    { &hf_eap_ms_chap_v2_data, {
+      "EAP-MS-CHAP-v2 Data", "eap.ms_chap_v2.data",
+      FT_BYTES, BASE_NONE, NULL, 0x0,
+      NULL, HFILL }},
+
+    { &hf_eap_data, {
+      "EAP Data", "eap.data",
+      FT_BYTES, BASE_NONE, NULL, 0x0,
+      NULL, HFILL }},
+
     /* Expanded type fields */
     { &hf_eap_ext_vendor_id, {
       "EAP-EXT Vendor Id", "eap.ext.vendor_id",