diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-09-06 08:44:23 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-09-09 01:25:36 +0000 |
| commit | 80407a46df538011c1dcea96714c401a4078a697 (patch) | |
| tree | f62b063004ba6a8946c552c6a3180cb8f417cd83 /epan/dissectors/packet-sccpmg.c | |
| parent | 124923b02f3113a1f2aeae205417a18828671850 (diff) | |
Eliminate proto_tree_add_text from some of the dissectors.
Other minor cleanups while in the area.
Change-Id: I99096ade9c69a4c148962d45bb6b0bd775040ba1
Reviewed-on: https://code.wireshark.org/review/4020
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-sccpmg.c')
| -rw-r--r-- | epan/dissectors/packet-sccpmg.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c index 08df987828..0f604854a0 100644 --- a/epan/dissectors/packet-sccpmg.c +++ b/epan/dissectors/packet-sccpmg.c @@ -36,6 +36,7 @@ #include <glib.h> #include <epan/packet.h> +#include <epan/expert.h> #include "packet-mtp3.h" #define SCCPMG_SSN 1 @@ -122,17 +123,7 @@ static int hf_sccpmg_congestion_level = -1; static gint ett_sccpmg = -1; static gint ett_sccpmg_affected_pc = -1; -static void -dissect_sccpmg_unknown_message(tvbuff_t *message_tvb, proto_tree *sccpmg_tree) -{ - guint32 message_length; - - message_length = tvb_length(message_tvb); - - proto_tree_add_text(sccpmg_tree, message_tvb, 0, message_length, - "Unknown message (%u byte%s)", message_length, - plurality(message_length, "", "s")); -} +static expert_field ei_sccpmg_unknown_msg = EI_INIT; static void dissect_sccpmg_affected_ssn(tvbuff_t *tvb, proto_tree *sccpmg_tree) @@ -224,7 +215,7 @@ dissect_sccpmg_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccpmg_tre case SCCPMG_MESSAGE_TYPE_SRT: if (mtp3_standard != ANSI_STANDARD) { - dissect_sccpmg_unknown_message(tvb, sccpmg_tree); + proto_tree_add_expert(sccpmg_tree, pinfo, &ei_sccpmg_unknown_msg, tvb, 0, -1); break; } /* else fallthrough */ @@ -249,7 +240,7 @@ dissect_sccpmg_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *sccpmg_tre /* else fallthrough */ default: - dissect_sccpmg_unknown_message(tvb, sccpmg_tree); + proto_tree_add_expert(sccpmg_tree, pinfo, &ei_sccpmg_unknown_msg, tvb, 0, -1); } } @@ -343,6 +334,12 @@ proto_register_sccpmg(void) &ett_sccpmg_affected_pc }; + static ei_register_info ei[] = { + { &ei_sccpmg_unknown_msg, { "sccpmg.unknown_msg", PI_UNDECODED, PI_WARN, "Unknown message", EXPFILL }}, + }; + + expert_module_t* expert_sccpmg; + /* Register the protocol name and description */ proto_sccpmg = proto_register_protocol("Signalling Connection Control Part Management", "SCCPMG", "sccpmg"); @@ -351,6 +348,8 @@ proto_register_sccpmg(void) used */ proto_register_field_array(proto_sccpmg, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); + expert_sccpmg = expert_register_protocol(proto_sccpmg); + expert_register_field_array(expert_sccpmg, ei, array_length(ei)); } void |