diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-07 06:29:31 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-12-07 06:29:31 +0000 |
| commit | fa1a51264f71b441ddc73103cda1f83cb951a135 (patch) | |
| tree | a38a9aee7da0a6de3317b3a8db1810edef2745af | |
| parent | 1046e0eadb474c3fcdb55bd1e7534ea4b03332b3 (diff) | |
RatingGroup -> RatingGroupId
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40110 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | asn1/gprscdr/GPRSChargingDataTypesV641.asn | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-gprscdr.c | 16 |
2 files changed, 5 insertions, 17 deletions
diff --git a/asn1/gprscdr/GPRSChargingDataTypesV641.asn b/asn1/gprscdr/GPRSChargingDataTypesV641.asn index b009f884dc..50bddc2ce9 100644 --- a/asn1/gprscdr/GPRSChargingDataTypesV641.asn +++ b/asn1/gprscdr/GPRSChargingDataTypesV641.asn @@ -543,9 +543,6 @@ ChangeOfServiceCondition ::= SEQUENCE pSFurnishChargingInformation [18] PSFurnishChargingInformation OPTIONAL } --- WS not defined ??? -RatingGroupId ::= OCTET STRING - ChangeLocation ::= SEQUENCE { -- @@ -662,7 +659,8 @@ QoSInformation ::= OCTET STRING (SIZE (4..15)) -- is a 1:1 copy of the contents (i.e. starting with octet 4) of the "Quality of -- service Profile" information element specified in 3GPP TS 29.060 [75]. -RatingGroup ::= INTEGER +-- RatingGroup ::= INTEGER Typo ? +RatingGroupId ::= INTEGER -- -- IP service flow identity (DCCA), range of 4 byte (0...4294967259) -- see Rating-Group AVP as used in 3GPP TS 32.299 [40] diff --git a/epan/dissectors/packet-gprscdr.c b/epan/dissectors/packet-gprscdr.c index 2eae899470..aa3651c17a 100644 --- a/epan/dissectors/packet-gprscdr.c +++ b/epan/dissectors/packet-gprscdr.c @@ -1493,8 +1493,8 @@ dissect_gprscdr_PSFurnishChargingInformation(gboolean implicit_tag _U_, tvbuff_t static int dissect_gprscdr_RatingGroupId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, + NULL); return offset; } @@ -1693,16 +1693,6 @@ dissect_gprscdr_GPRSCallEventRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_ return offset; } - - -static int -dissect_gprscdr_RatingGroup(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); - - return offset; -} - /*--- PDUs ---*/ int dissect_gprscdr_GPRSCallEventRecord_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { @@ -2138,7 +2128,7 @@ proto_register_gprscdr(void) "TimeStamp", HFILL }}, { &hf_gprscdr_ratingGroup, { "ratingGroup", "gprscdr.ratingGroup", - FT_BYTES, BASE_NONE, NULL, 0, + FT_INT32, BASE_DEC, NULL, 0, "RatingGroupId", HFILL }}, { &hf_gprscdr_chargingRuleBaseName, { "chargingRuleBaseName", "gprscdr.chargingRuleBaseName", |