diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-04-14 22:43:16 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-05-13 03:59:52 +0000 |
| commit | a1891f64ec7e56a38e61225ced912c65fd053793 (patch) | |
| tree | 81a4d35610fa9f89abfbcfc5a93d49aefac59e82 /epan/dissectors/packet-isup.h | |
| parent | d12561f61a2569f9dab3c1415efc14075afe2b71 (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-isup.h')
| -rw-r--r-- | epan/dissectors/packet-isup.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isup.h b/epan/dissectors/packet-isup.h index d2c1ad7861..54aceb348f 100644 --- a/epan/dissectors/packet-isup.h +++ b/epan/dissectors/packet-isup.h @@ -172,18 +172,18 @@ WS_DLL_PUBLIC value_string_ext isup_calling_partys_category_value_ext; */ void dissect_nsap(tvbuff_t *parameter_tvb,gint offset,gint len, proto_tree *parameter_tree); WS_DLL_PUBLIC -void dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); +void dissect_isup_called_party_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); WS_DLL_PUBLIC -void dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); +void dissect_isup_calling_party_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); void dissect_isup_cause_indicators_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); WS_DLL_PUBLIC void dissect_isup_redirection_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); WS_DLL_PUBLIC void dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); WS_DLL_PUBLIC -void dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); +void dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); -void dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); +void dissect_isup_location_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); void dissect_isup_generic_number_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *parameter_tree, proto_item *parameter_item); |