diff options
| author | Joakim Karlsson <oakimk@gmail.com> | 2017-09-07 23:20:34 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-08 13:20:51 +0000 |
| commit | 585297b189ba7f39db34f66f57d25429c8daf570 (patch) | |
| tree | 97f271a814eeb300a1030fac652ffb484ae1ae5a /epan/dissectors/asn1 | |
| parent | df21aa90250c29d7466d55d9e0eda2cddd0dfbd8 (diff) | |
GPRSCDR: decoding of EPS QoS/aRP
* Decoding of Allocation/Retention Priority (ARP)
* Fix order of ARP in GTPv2
Change-Id: Ica24877f3518b5e0b6883ba535ffe09be8f446c2
Reviewed-on: https://code.wireshark.org/review/23431
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1')
| -rw-r--r-- | epan/dissectors/asn1/gprscdr/gprscdr.cnf | 17 | ||||
| -rw-r--r-- | epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/epan/dissectors/asn1/gprscdr/gprscdr.cnf b/epan/dissectors/asn1/gprscdr/gprscdr.cnf index a2f0672930..f4c5829fb2 100644 --- a/epan/dissectors/asn1/gprscdr/gprscdr.cnf +++ b/epan/dissectors/asn1/gprscdr/gprscdr.cnf @@ -140,6 +140,23 @@ GPRSRecord offset = decode_qos_umts(tvb, 0, actx->pinfo, tree, hfi->name, 0); +#.FN_BODY EPCQoSInformation/aRP + proto_tree *ext_tree_arp; + guint length; + + /* + * 8.86 Allocation/Retention Priority (ARP) + * 3GPP TS 29.274 + */ + + length = tvb_reported_length(tvb); + ext_tree_arp = proto_tree_add_subtree(tree, tvb, 0, length, ett_gprscdr_eps_qos_arp, NULL, "aRP"); + + dissect_gtpv2_arp(tvb, actx->pinfo, ext_tree_arp, NULL, length, 0, 0, NULL); + + offset = length; + + #.FN_BODY GGSNPDPRecord/userLocationInformation offset = dissect_gprscdr_uli(tvb, actx, tree, 1); diff --git a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c index 238108714e..c9a59bca49 100644 --- a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c +++ b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c @@ -48,6 +48,7 @@ static int proto_gprscdr = -1; static int ett_gprscdr = -1; static int ett_gprscdr_timestamp = -1; static int ett_gprscdr_plmn_id = -1; +static int ett_gprscdr_eps_qos_arp = -1; static int ett_gprscdr_managementextension_information = -1; static int ett_gprscdr_userlocationinformation = -1; #include "packet-gprscdr-ett.c" @@ -136,6 +137,7 @@ proto_register_gprscdr(void) &ett_gprscdr, &ett_gprscdr_timestamp, &ett_gprscdr_plmn_id, + &ett_gprscdr_eps_qos_arp, &ett_gprscdr_managementextension_information, &ett_gprscdr_userlocationinformation, #include "packet-gprscdr-ettarr.c" |