diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2015-10-30 14:46:09 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-30 15:55:07 +0000 |
| commit | f0eae93df5b3751b12d3c0b5694ac00fe4e461eb (patch) | |
| tree | 5496988f73f0710a3a71ce072895e828dccc2b70 /epan/dissectors/packet-gtpv2.c | |
| parent | 59f4c1cd04275cd7306156ed22dc67092b93a024 (diff) | |
| download | wireshark-f0eae93df5b3751b12d3c0b5694ac00fe4e461eb.tar.gz | |
[GTPv2] Dissect Load Control Information IE
Bug: 11655
Change-Id: I9d50d53ce6b98d7a3e06e90450607f6d5b6be1bc
Reviewed-on: https://code.wireshark.org/review/11430
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gtpv2.c')
| -rw-r--r-- | epan/dissectors/packet-gtpv2.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index d463e614ba..7c01fded6f 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -547,6 +547,7 @@ static gint ett_gtpv2_preaa_ecgis = -1; static gint ett_gtpv2_preaa_rais = -1; static gint ett_gtpv2_preaa_sais = -1; static gint ett_gtpv2_preaa_cgis = -1; +static gint ett_gtpv2_load_control_inf = -1; static expert_field ei_gtpv2_ie_data_not_dissected = EI_INIT; static expert_field ei_gtpv2_ie_len_invalid = EI_INIT; @@ -5734,7 +5735,15 @@ dissect_gtpv2_overload_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_ static void dissect_gtpv2_load_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) { - proto_tree_add_expert(tree, pinfo, &ei_gtpv2_ie_data_not_dissected, tvb, 0, length); + int offset = 0; + tvbuff_t *new_tvb; + proto_tree *grouped_tree; + + proto_item_append_text(item, "[Grouped IE]"); + grouped_tree = proto_item_add_subtree(item, ett_gtpv2_load_control_inf); + + new_tvb = tvb_new_subset_length(tvb, offset, length); + dissect_gtpv2_ie_common(new_tvb, pinfo, grouped_tree, 0, message_type); } /* * 8.113 Metric @@ -5742,12 +5751,15 @@ dissect_gtpv2_load_control_inf(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree static void dissect_gtpv2_metric(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) { - guint8 oct; + guint32 oct; - oct = tvb_get_guint8(tvb, 0); - proto_tree_add_item(tree, hf_gtpv2_metric, tvb, 0, 1, ENC_BIG_ENDIAN); - if(oct > 0x64) + proto_tree_add_item_ret_uint(tree, hf_gtpv2_metric, tvb, 0, 1, ENC_BIG_ENDIAN, &oct); + if (oct > 0x64) { proto_item_append_text(item, "Metric: value beyond 100 is considered as 0"); + } else { + proto_item_append_text(item, "%u", oct); + + } } /* * 8.114 Sequence Number @@ -5755,7 +5767,9 @@ dissect_gtpv2_metric(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, pr static void dissect_gtpv2_seq_no(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_item *item _U_, guint16 length _U_, guint8 message_type _U_, guint8 instance _U_) { - proto_tree_add_item(tree, hf_gtpv2_sequence_number, tvb, 0, 4, ENC_BIG_ENDIAN); + guint32 seq; + proto_tree_add_item_ret_uint(tree, hf_gtpv2_sequence_number, tvb, 0, 4, ENC_BIG_ENDIAN, &seq); + proto_item_append_text(item, "%u", seq); } /* * 8.115 APN and Relative Capacity @@ -8062,6 +8076,7 @@ void proto_register_gtpv2(void) &ett_gtpv2_preaa_rais, &ett_gtpv2_preaa_sais, &ett_gtpv2_preaa_cgis, + &ett_gtpv2_load_control_inf, }; static ei_register_info ei[] = { |