aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
authorJoakim Karlsson <oakimk@gmail.com>2017-07-16 20:19:53 +0200
committerMichael Mann <mmann78@netscape.net>2017-07-16 20:44:39 +0000
commit47db24861ef8b418964ad3b7d97c856a7243770a (patch)
tree6fe6758ee081e0837d4bf87494cf1c326785b82b /epan/dissectors/asn1
parent1ed38dc2be1b6984fad9c2e4f22094f43907a318 (diff)
GPRSCDR: decoding of GPRS/UMTS QoS-information
Change-Id: Ia912925f689d2912c62d01fcc8230065204b6f15 Reviewed-on: https://code.wireshark.org/review/22633 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/gprscdr/gprscdr.cnf12
-rw-r--r--epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c1
2 files changed, 13 insertions, 0 deletions
diff --git a/epan/dissectors/asn1/gprscdr/gprscdr.cnf b/epan/dissectors/asn1/gprscdr/gprscdr.cnf
index b57e0c1306..1616ed0342 100644
--- a/epan/dissectors/asn1/gprscdr/gprscdr.cnf
+++ b/epan/dissectors/asn1/gprscdr/gprscdr.cnf
@@ -128,6 +128,18 @@ GPRSRecord
subtree = proto_item_add_subtree(actx->created_item, ett_gprscdr_plmn_id);
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, TRUE);
+#.FN_BODY QoSInformation
+
+ /* This octet string is a 1:1 copy of the contents (i.e. starting with octet 4) of the
+ * Quality of Service (QoS) Profile information element specified in 29.060, ch7.7.34.
+ *
+ */
+
+ header_field_info *hfi;
+ hfi = proto_registrar_get_nth(hf_index);
+
+ offset = decode_qos_umts(tvb, 0, actx->pinfo, tree, hfi->name, 0);
+
#.FN_BODY GPRSRecord VAL_PTR = &branch_taken
proto_item *item;
gint branch_taken, t_offset = offset;
diff --git a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c
index 37e3466989..9f5efef08a 100644
--- a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c
+++ b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c
@@ -31,6 +31,7 @@
#include "packet-gsm_map.h"
#include "packet-e212.h"
#include "packet-gprscdr.h"
+#include "packet-gtp.h"
#define PNAME "GPRS CDR"
#define PSNAME "GPRSCDR"