osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GPRSCDR: fix bitrates in EPCQoSInformation 

Changed type for the bitrate fields, from signed32 to unsigned32.
This fixes the problem of getting "-1" values at G_MAXUINT32.

TS 32.298 refers to TS 29.212 regarding bitrates, in TS 29.212 the
corresponding AVPs are defined as Unsigned32.

Change-Id: I6e0083bf034c7254ab48ca3c2c405cc20f5d6394
Reviewed-on: https://code.wireshark.org/review/26585
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Joakim Karlsson 2018-03-21 10:50:36 +01:00 committed by Pascal Quantin
parent ca9976bec9
commit 83d028792a
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epan/dissectors/asn1/gprscdr/gprscdr.cnf
View File

@ -259,6 +259,18 @@ gint32 tag;
IPBinV4Address TYPE = FT_IPv4 DISPLAY = BASE_NONE
IPBinV6Address TYPE = FT_IPv6 DISPLAY = BASE_NONE
RATType TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(gprscdr_rat_type_vals)
EPCQoSInformation/maxRequestedBandwithUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/maxRequestedBandwithDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/guaranteedBitrateUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/guaranteedBitrateDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/aPNAggregateMaxBitrateUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/aPNAggregateMaxBitrateDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedMaxRequestedBWUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedMaxRequestedBWDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedGBRUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedGBRDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedAPNAMBRUL TYPE = FT_UINT32 DISPLAY = BASE_DEC
EPCQoSInformation/extendedAPNAMBRDL TYPE = FT_UINT32 DISPLAY = BASE_DEC
#.END
#

24
epan/dissectors/packet-gprscdr.c
View File

@ -6086,19 +6086,19 @@ proto_register_gprscdr(void)
"INTEGER", HFILL }},
{ &hf_gprscdr_maxRequestedBandwithUL,
{ "maxRequestedBandwithUL", "gprscdr.maxRequestedBandwithUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_maxRequestedBandwithDL,
{ "maxRequestedBandwithDL", "gprscdr.maxRequestedBandwithDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_guaranteedBitrateUL,
{ "guaranteedBitrateUL", "gprscdr.guaranteedBitrateUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_guaranteedBitrateDL,
{ "guaranteedBitrateDL", "gprscdr.guaranteedBitrateDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_aRP,
{ "aRP", "gprscdr.aRP",
@ -6106,35 +6106,35 @@ proto_register_gprscdr(void)
NULL, HFILL }},
{ &hf_gprscdr_aPNAggregateMaxBitrateUL,
{ "aPNAggregateMaxBitrateUL", "gprscdr.aPNAggregateMaxBitrateUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_aPNAggregateMaxBitrateDL,
{ "aPNAggregateMaxBitrateDL", "gprscdr.aPNAggregateMaxBitrateDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedMaxRequestedBWUL,
{ "extendedMaxRequestedBWUL", "gprscdr.extendedMaxRequestedBWUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedMaxRequestedBWDL,
{ "extendedMaxRequestedBWDL", "gprscdr.extendedMaxRequestedBWDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedGBRUL,
{ "extendedGBRUL", "gprscdr.extendedGBRUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedGBRDL,
{ "extendedGBRDL", "gprscdr.extendedGBRDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedAPNAMBRUL,
{ "extendedAPNAMBRUL", "gprscdr.extendedAPNAMBRUL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_extendedAPNAMBRDL,
{ "extendedAPNAMBRDL", "gprscdr.extendedAPNAMBRDL",
FT_INT32, BASE_DEC, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"INTEGER", HFILL }},
{ &hf_gprscdr_numberOfEvents,
{ "numberOfEvents", "gprscdr.numberOfEvents",