aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-camel.c
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-04-14 22:43:16 -0400
committerAnders Broman <a.broman58@gmail.com>2016-05-13 03:59:52 +0000
commita1891f64ec7e56a38e61225ced912c65fd053793 (patch)
tree81a4d35610fa9f89abfbcfc5a93d49aefac59e82 /epan/dissectors/packet-camel.c
parentd12561f61a2569f9dab3c1415efc14075afe2b71 (diff)
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 <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-camel.c')
-rw-r--r--epan/dissectors/packet-camel.c8
1 files changed, 4 insertions, 4 deletions
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;
}