From de87ac174abfb4a9f49fabf4672cbaa367d59a34 Mon Sep 17 00:00:00 2001
From: alagoutte <alagoutte@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 9 Dec 2011 16:39:18 +0000
Subject: From Juha Takala via
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6654 ELCOM dissector
 needs small fixes for some protocol sub-field texts

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40131 f5534014-38df-0310-8fa8-9805f1628bb7
---
 epan/dissectors/packet-elcom.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c
index fdaa907b46..2e6f64cab6 100644
--- a/epan/dissectors/packet-elcom.c
+++ b/epan/dissectors/packet-elcom.c
@@ -115,8 +115,8 @@ static const value_string endian_vals[] = {
 };
 
 static const value_string suffix_vals[] = {
-        {'A', "Big"},
-        {'B', "Little"},
+        {'A', "Control"},
+        {'B', "Unsolicited"},
         {'C', "Periodic"},
         {'D', "Requested, scheduling"},
         {'E', "Requested, present/archived"},
@@ -151,6 +151,11 @@ static const value_string datarequest_grouptype_vals[] = {
         {0, NULL }
 };
 
+static const value_string datarequest_result_vals[] = {
+        {0x00, "OK"},
+        {0, NULL }
+};
+
 static const value_string type_vals[] = {
         {P_CONRQ, "Connect Request"},
         {P_CONRS, "Connect Response"},
@@ -333,6 +338,10 @@ dissect_datarequest(proto_item *ti_arg, gint ett_arg, tvbuff_t *tvb, gint arg_of
 
         switch (gtype) {
 
+        case TC_REQ:
+                /* No more data for this type, suppress the error message */
+                break;
+
         case TC_RSP:
 
                 proto_tree_add_uint(tree, hf_elcom_datarequest_result,
@@ -693,12 +702,12 @@ proto_register_elcom(void)
 
                 { &hf_elcom_datarequest_grouptype,
                   { "Group Type",        "elcom.datarequest.grouptype",
-                    FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
+                    FT_UINT8, BASE_DEC, VALS(datarequest_grouptype_vals), 0, NULL, HFILL }
                 },
 
                 { &hf_elcom_datarequest_result,
                   { "Result",        "elcom.datarequest.result",
-                    FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
+                    FT_UINT8, BASE_DEC, VALS(datarequest_result_vals), 0, NULL, HFILL }
                 },
 
                 { &hf_elcom_datarequest_groupnumber,
-- 
cgit v1.2.3