From a1891f64ec7e56a38e61225ced912c65fd053793 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 14 Apr 2016 22:43:16 -0400 Subject: Add filterable fields for each ISUP number. Make a common number dissection function to do this without cut-n-pasting code a whole bunch of times. Clean up the number dissection code while we're there: - Don't throw an exception when we found too many digits. Report it (expert info) and move on. - Avoid a useless (text) subtree: use the hf for the number as the root of the tree. This means using proto_tree_append_string() which adds some complication but it's worth it to avoid a hidden item (which was the old solution if we passed the number to the E.164 dissector). Bug: 12334 Change-Id: I465cab91b216b734f5763a4e56faa8e06b0731a2 Reviewed-on: https://code.wireshark.org/review/14924 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- epan/dissectors/packet-camel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'epan/dissectors/packet-camel.c') diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 942ab8bb25..0b80f9d13d 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -2182,7 +2182,7 @@ dissect_camel_CalledPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_calledpartybcdnumber); - dissect_isup_called_party_number_parameter(parameter_tvb, subtree, NULL); + dissect_isup_called_party_number_parameter(parameter_tvb, actx->pinfo, subtree, NULL); return offset; } @@ -2202,7 +2202,7 @@ dissect_camel_CallingPartyNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_callingpartynumber); -dissect_isup_calling_party_number_parameter(parameter_tvb, subtree, NULL); +dissect_isup_calling_party_number_parameter(parameter_tvb, actx->pinfo, subtree, NULL); return offset; } @@ -2808,7 +2808,7 @@ dissect_camel_LocationNumber(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o return offset; subtree = proto_item_add_subtree(actx->created_item, ett_camel_locationnumber); -dissect_isup_location_number_parameter(parameter_tvb, subtree, NULL); +dissect_isup_location_number_parameter(parameter_tvb, actx->pinfo, subtree, NULL); return offset; } @@ -4857,7 +4857,7 @@ dissect_camel_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i if (!parameter_tvb) return offset; - dissect_isup_redirecting_number_parameter(parameter_tvb, tree, NULL); + dissect_isup_redirecting_number_parameter(parameter_tvb, actx->pinfo, tree, NULL); return offset; } -- cgit v1.2.3