From ab03f358502c3b39672df636f8deb12644c4a89b Mon Sep 17 00:00:00 2001 From: Joakim Karlsson Date: Mon, 2 Dec 2019 17:35:40 +0100 Subject: [PATCH] gprscdr: add newer RAT types According to TS 29.274 V15.9.0 Change-Id: I93b6f804310e9f5b979eb7cc78f3550c4b89a7c1 Reviewed-on: https://code.wireshark.org/review/35283 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c | 4 +++- epan/dissectors/packet-gprscdr.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c index 06a5a44799..6cce056cc7 100644 --- a/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c +++ b/epan/dissectors/asn1/gprscdr/packet-gprscdr-template.c @@ -70,7 +70,9 @@ static const value_string gprscdr_rat_type_vals[] = { {6, "EUTRAN"}, {7, "Virtual"}, {8, "EUTRAN-NB-IoT"}, - /* 9-100 Spare for future use TS 29.061 */ + {9, "LTE-M"}, + {10, "NR"}, + /* 11-100 Spare for future use TS 29.061 */ {101, "IEEE 802.16e"}, {102, "3GPP2 eHRPD"}, {103, "3GPP2 HRPD"}, diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 4a137da2f1..cd2e1bedd6 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -645,7 +645,9 @@ static const value_string gprscdr_rat_type_vals[] = { {6, "EUTRAN"}, {7, "Virtual"}, {8, "EUTRAN-NB-IoT"}, - /* 9-100 Spare for future use TS 29.061 */ + {9, "LTE-M"}, + {10, "NR"}, + /* 11-100 Spare for future use TS 29.061 */ {101, "IEEE 802.16e"}, {102, "3GPP2 eHRPD"}, {103, "3GPP2 HRPD"}, @@ -4961,7 +4963,7 @@ int dissect_gprscdr_GPRSRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-gprscdr-fn.c ---*/ -#line 113 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 115 "./asn1/gprscdr/packet-gprscdr-template.c" @@ -6828,7 +6830,7 @@ proto_register_gprscdr(void) NULL, HFILL }}, /*--- End of included file: packet-gprscdr-hfarr.c ---*/ -#line 123 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 125 "./asn1/gprscdr/packet-gprscdr-template.c" }; /* List of subtrees */ @@ -6938,7 +6940,7 @@ proto_register_gprscdr(void) &ett_gprscdr_WLANOperatorId, /*--- End of included file: packet-gprscdr-ettarr.c ---*/ -#line 135 "./asn1/gprscdr/packet-gprscdr-template.c" +#line 137 "./asn1/gprscdr/packet-gprscdr-template.c" }; static ei_register_info ei[] = {