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

gprscdr: Update to 3GPP TS 32.298 V15.6.0 

Change-Id: Iec680f2f2ac9b0149ad9933cb2e805dc9aa00d32
Reviewed-on: https://code.wireshark.org/review/33202
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Joakim Karlsson 2019-05-14 20:21:11 +02:00 committed by Anders Broman
parent 7b43c480f6
commit c1220ec0c7
4 changed files with 210 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
epan/dissectors/asn1/gprscdr/GPRSChargingDataTypes.asn
View File

@ -15,9 +15,11 @@ CallDuration,
CallingNumber,
CauseForRecClosing,
CellId,
ChargingID,
CivicAddressInformation,
Diagnostics,
DiameterIdentity,
DiameterIdentity,
DynamicAddressFlag,
EnhancedDiagnostics,
-- GSNAddress,
IPAddress,
@ -33,7 +35,11 @@ MBMSInformation,
MessageReference,
MSISDN,
MSTimeZone,
NodeID,
PDPAddress,
PLMN-Id,
PositioningData,
RATType,
RecordingEntity,
RecordType,
RoutingAreaCode,
@ -1007,11 +1013,6 @@ ChangeLocation ::= SEQUENCE
ChargingCharacteristics ::= OCTET STRING (SIZE(2))
ChargingID ::= INTEGER (0..4294967295)
--
-- Generated in P-GW, part of IP-CAN bearer
-- 0..4294967295 is equivalent to 0..2**32-1
--
ChargingPerIPCANSessionIndicator ::= ENUMERATED
{
@ -1072,7 +1073,6 @@ DataVolumeMBMS ::= INTEGER
-- The volume of data transferred in octets.
--
DynamicAddressFlag ::= BOOLEAN
EPCQoSInformation ::= SEQUENCE
--
@ -1177,17 +1177,7 @@ NetworkInitiatedPDPContext ::= BOOLEAN
-- Set to true if PDP context was initiated from network side
--
NodeID ::= IA5String (SIZE(1..20))
NumberOfDPEncountered ::= INTEGER
PDPAddress ::= CHOICE
{
iPAddress [0] IPAddress
-- eTSIAddress [1] ETSIAddress
-- has only been used in earlier releases for X.121 format
}
PDPType ::= OCTET STRING (SIZE(2))
--
-- OCTET 1: PDP Type Organization
@ -1201,11 +1191,6 @@ PDPPDNTypeExtension ::= INTEGER
-- This integer is 1:1 copy of the PDP type value as defined in TS 29.061 [215].
--
PLMN-Id ::= OCTET STRING (SIZE (3))
--
-- This is in the same format as octets 2,3,and 4 of the Routing Area Identity (RAI) IE specified
-- in TS 29.060 [215]
--
PresenceReportingAreaElementsList ::= OCTET STRING
--
@ -1220,13 +1205,16 @@ PresenceReportingAreaInfo ::= SEQUENCE
presenceReportingAreaElementsList[2] PresenceReportingAreaElementsList OPTIONAL,
presenceReportingAreaNode [3] PresenceReportingAreaNode OPTIONAL
}
PresenceReportingAreaNode ::= ENUMERATED
PresenceReportingAreaNode ::= BIT STRING
{
oCS (0),
pCRF (1),
oCSandPCRF (2)
pCRF (1)
}
--
-- This bit mask has the same format as Presence-Reporting-Area-Node AVP in TS 29.212 [220]
--
PresenceReportingAreaStatus ::= ENUMERATED
{
@ -1275,11 +1263,6 @@ RatingGroupId ::= INTEGER
-- see Rating-Group AVP as used in TS 32.299 [50]
--
RATType ::= INTEGER (0..255)
--
-- Ihis integer is 1:1 copy of the RAT type value as defined in TS 29.061 [215].
--
RelatedChangeOfCharCondition ::= SEQUENCE
{
changeCondition [5] ChangeCondition,

66
epan/dissectors/asn1/gprscdr/GenericChargingDataTypes.asn
View File

@ -265,22 +265,31 @@ CauseForTerm ::= INTEGER
unknownOrUnreachableLCSClient (58)
}
ChargingID ::= INTEGER (0..4294967295)
--
-- Generated in P-GW, part of IP-CAN bearer
-- 0..4294967295 is equivalent to 0..2**32-1
--
CivicAddressInformation ::= OCTET STRING
--
-- as defined in subclause 3.1 of IETF RFC 4776 [409] excluding the first 3 octets.
--
DataVolumeOctets ::= INTEGER
--
-- The volume of data transferred in octets.
--
CNIPMulticastDistribution ::= ENUMERATED
{
nO-IP-MULTICAST (0),
iP-MULTICAST (1)
}
DataVolumeOctets ::= INTEGER
--
-- The volume of data transferred in octets.
--
DynamicAddressFlag ::= BOOLEAN
Diagnostics ::= CHOICE
{
gsm0408Cause [0] INTEGER,
@ -313,6 +322,14 @@ EnhancedDiagnostics ::= SEQUENCE
GSNAddress ::= IPAddress
InvolvedParty ::= CHOICE
{
sIP-URI [0] GraphicString, -- refer to rfc3261 [401]
tEL-URI [1] GraphicString, -- refer to rfc3966 [402]
uRN [2] GraphicString, -- refer to rfc5031 [407]
iSDN-E164 [3] GraphicString -- refer to ITU-T Recommendation E.164[308]
}
IPAddress ::= CHOICE
{
iPBinaryAddress IPBinaryAddress,
@ -451,6 +468,14 @@ MCC-MNC ::= OCTET STRING (SIZE(3))
-- See TS 24.008 [208]
--
MessageClass ::= ENUMERATED
{
personal (0),
advertisement (1),
information-service (2),
auto (3)
}
MessageReference ::= OCTET STRING
MSCAddress ::= AddressString
@ -470,6 +495,8 @@ MSTimeZone ::= OCTET STRING (SIZE (2))
-- 1.Octet: Time Zone and 2. Octet: Daylight saving time, see TS 29.060 [215]
--
NodeID ::= IA5String (SIZE(1..20))
NodeAddress ::= CHOICE
{
iPAddress [0] IPAddress,
@ -482,15 +509,40 @@ PDPAddressPrefixLength ::=INTEGER (1..64)
-- and the default value is 64 bits.
--
PDPAddress ::= CHOICE
{
iPAddress [0] IPAddress
-- eTSIAddress [1] ETSIAddress
-- has only been used in earlier releases for X.121 format
}
PLMN-Id ::= OCTET STRING (SIZE (3))
--
-- This is in the same format as octets 2,3,and 4 of the Routing Area Identity (RAI) IE specified
-- in TS 29.060 [215]
--
PositioningData ::= OCTET STRING (SIZE(1..33))
--
-- See Positioning Data IE (octet 3..n), TS 49.031 [227]
--
PriorityType ::= ENUMERATED
{
low (0),
normal (1),
high (2)
}
RANNASCause ::= OCTET STRING
-- This octet string is a 1:1 copy of the contents (i.e. starting with octet 5)
-- of the "RAN/NAS Cause" information element specified in TS 29.274 [223].
RATType ::= INTEGER (0..255)
--
--This integer is 1:1 copy of the RAT type value as defined in TS 29.061 [215].
--
RecordingEntity ::= AddressString
RecordType ::= INTEGER
@ -698,6 +750,10 @@ SCSASAddress ::= SET
sCSRealm [2] DiameterIdentity
}
Session-Id ::= GraphicString
--
-- rfc3261 [401]: example for SIP CALL-ID: f81d4fae-7dec-11d0-a765-00a0c91e6bf6@foo.bar.com
--
ServiceContextID ::= UTF8String

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

@ -17,6 +17,10 @@ ServiceContextID
ChangeLocationV651
SubscriberEquipmentNumber
SubscriberEquipmentType
Session-Id
PriorityType
MessageClass
InvolvedParty
# 6.4 If these are needed MBMS asn1 should be added.
MSCAddress

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

@ -84,6 +84,7 @@ static int hf_gprscdr_mBMSGWAddress = -1; /* GSNAddress */
static int hf_gprscdr_cNIPMulticastDistribution = -1; /* CNIPMulticastDistribution */
static int hf_gprscdr_mBMSDataTransferStart = -1; /* MBMSTime */
static int hf_gprscdr_mBMSDataTransferStop = -1; /* MBMSTime */
static int hf_gprscdr_iPAddress = -1; /* IPAddress */
static int hf_gprscdr_sCSAddress = -1; /* IPAddress */
static int hf_gprscdr_sCSRealm = -1; /* DiameterIdentity */
static int hf_gprscdr_serviceSpecificData = -1; /* GraphicString */
@ -385,7 +386,6 @@ static int hf_gprscdr_flowNumber = -1; /* T_flowNumber */
static int hf_gprscdr_flowNumber_item = -1; /* INTEGER */
static int hf_gprscdr_counterValue = -1; /* INTEGER */
static int hf_gprscdr_counterTimestamp = -1; /* TimeStamp */
static int hf_gprscdr_iPAddress = -1; /* IPAddress */
static int hf_gprscdr_presenceReportingAreaIdentifier = -1; /* OCTET_STRING */
static int hf_gprscdr_presenceReportingAreaElementsList = -1; /* PresenceReportingAreaElementsList */
static int hf_gprscdr_presenceReportingAreaNode = -1; /* PresenceReportingAreaNode */
@ -467,6 +467,8 @@ static int hf_gprscdr_ServiceConditionChangeV750_timeLimit = -1;
static int hf_gprscdr_ServiceConditionChangeV750_volumeLimit = -1;
static int hf_gprscdr_ServiceConditionChangeV750_serviceSpecificUnitLimit = -1;
static int hf_gprscdr_ServiceConditionChangeV750_envelopeClosure = -1;
static int hf_gprscdr_PresenceReportingAreaNode_oCS = -1;
static int hf_gprscdr_PresenceReportingAreaNode_pCRF = -1;
static int hf_gprscdr_ServiceConditionChange_qoSChange = -1;
static int hf_gprscdr_ServiceConditionChange_sGSNChange = -1;
static int hf_gprscdr_ServiceConditionChange_sGSNPLMNIDChange = -1;
@ -532,6 +534,7 @@ static gint ett_gprscdr_LevelOfCAMELService = -1;
static gint ett_gprscdr_LocationAreaAndCell = -1;
static gint ett_gprscdr_ManagementExtensions = -1;
static gint ett_gprscdr_MBMSInformation = -1;
static gint ett_gprscdr_PDPAddress = -1;
static gint ett_gprscdr_SCSASAddress = -1;
static gint ett_gprscdr_ServiceSpecificInfo = -1;
static gint ett_gprscdr_SubscriptionID = -1;
@ -598,8 +601,8 @@ static gint ett_gprscdr_FixedUserLocationInformation = -1;
static gint ett_gprscdr_Flows = -1;
static gint ett_gprscdr_T_flowNumber = -1;
static gint ett_gprscdr_MOExceptionDataCounter = -1;
static gint ett_gprscdr_PDPAddress = -1;
static gint ett_gprscdr_PresenceReportingAreaInfo = -1;
static gint ett_gprscdr_PresenceReportingAreaNode = -1;
static gint ett_gprscdr_PSFurnishChargingInformation = -1;
static gint ett_gprscdr_RANSecondaryRATUsageReport = -1;
static gint ett_gprscdr_RelatedChangeOfCharCondition = -1;
@ -854,6 +857,16 @@ dissect_gprscdr_CauseForRecClosing(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_gprscdr_ChargingID(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;
}
static int
dissect_gprscdr_CivicAddressInformation(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,
@ -880,6 +893,15 @@ dissect_gprscdr_CNIPMulticastDistribution(gboolean implicit_tag _U_, tvbuff_t *t
static int
dissect_gprscdr_DynamicAddressFlag(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_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
return offset;
}
static int
dissect_gprscdr_INTEGER(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,
@ -910,7 +932,7 @@ dissect_gprscdr_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_gprscdr_T_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 46 "./asn1/gprscdr/gprscdr.cnf"
#line 50 "./asn1/gprscdr/gprscdr.cnf"
proto_tree *ext_tree;
ext_tree = proto_tree_add_subtree(tree, tvb, offset, -1, ett_gprscdr_managementextension_information, NULL, "Information");
@ -1456,7 +1478,7 @@ dissect_gprscdr_MSISDN(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_gprscdr_MSTimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 95 "./asn1/gprscdr/gprscdr.cnf"
#line 99 "./asn1/gprscdr/gprscdr.cnf"
/*
*
* 1.Octet: Time Zone and 2. Octet: Daylight saving time, see TS 29.060 [75]
@ -1492,6 +1514,60 @@ dissect_gprscdr_MSTimeZone(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
static int
dissect_gprscdr_NodeID(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static const value_string gprscdr_PDPAddress_vals[] = {
{ 0, "iPAddress" },
{ 0, NULL }
};
static const ber_choice_t PDPAddress_choice[] = {
{ 0, &hf_gprscdr_iPAddress , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprscdr_IPAddress },
{ 0, NULL, 0, 0, 0, NULL }
};
static int
dissect_gprscdr_PDPAddress(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_choice(actx, tree, tvb, offset,
PDPAddress_choice, hf_index, ett_gprscdr_PDPAddress,
NULL);
return offset;
}
static int
dissect_gprscdr_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 126 "./asn1/gprscdr/gprscdr.cnf"
tvbuff_t *parameter_tvb;
proto_tree *subtree;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
&parameter_tvb);
if (!parameter_tvb)
return offset;
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);
return offset;
}
static int
dissect_gprscdr_PositioningData(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,
@ -1502,6 +1578,16 @@ dissect_gprscdr_PositioningData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_gprscdr_RATType(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;
}
static int
dissect_gprscdr_RecordingEntity(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_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -1758,7 +1844,7 @@ dissect_gprscdr_ThreeGPPPSDataOffStatus(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_gprscdr_TimeStamp(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 56 "./asn1/gprscdr/gprscdr.cnf"
#line 60 "./asn1/gprscdr/gprscdr.cnf"
/*
*
* The contents of this field are a compact form of the UTCTime format
@ -1825,16 +1911,6 @@ dissect_gprscdr_MSNetworkCapability(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_gprscdr_ChargingID(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;
}
static int
dissect_gprscdr_AccessPointNameNI(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
@ -1848,7 +1924,7 @@ dissect_gprscdr_AccessPointNameNI(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_gprscdr_PDPType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 219 "./asn1/gprscdr/gprscdr.cnf"
#line 223 "./asn1/gprscdr/gprscdr.cnf"
proto_tree *ext_tree_pdp_pdn_type;
guint length;
@ -1881,30 +1957,10 @@ dissect_gprscdr_PDPType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
}
static const value_string gprscdr_PDPAddress_vals[] = {
{ 0, "iPAddress" },
{ 0, NULL }
};
static const ber_choice_t PDPAddress_choice[] = {
{ 0, &hf_gprscdr_iPAddress , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprscdr_IPAddress },
{ 0, NULL, 0, 0, 0, NULL }
};
static int
dissect_gprscdr_PDPAddress(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_choice(actx, tree, tvb, offset,
PDPAddress_choice, hf_index, ett_gprscdr_PDPAddress,
NULL);
return offset;
}
static int
dissect_gprscdr_QoSInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 134 "./asn1/gprscdr/gprscdr.cnf"
#line 138 "./asn1/gprscdr/gprscdr.cnf"
/* 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.
@ -1968,7 +2024,7 @@ dissect_gprscdr_FailureHandlingContinue(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_gprscdr_T_userLocationInformation_04(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 179 "./asn1/gprscdr/gprscdr.cnf"
#line 183 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -2052,17 +2108,6 @@ dissect_gprscdr_CauseForRecClosingV651(gboolean implicit_tag _U_, tvbuff_t *tvb
}
static int
dissect_gprscdr_NodeID(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_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
actx, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static const value_string gprscdr_APNSelectionMode_vals[] = {
{ 0, "mSorNetworkProvidedSubscriptionVerified" },
{ 1, "mSProvidedSubscriptionNotVerified" },
@ -2102,16 +2147,6 @@ dissect_gprscdr_ChargingCharacteristics(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_gprscdr_RATType(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;
}
static int
dissect_gprscdr_SCFAddress(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_gsm_map_AddressString(implicit_tag, tvb, offset, actx, tree, hf_index);
@ -2210,15 +2245,6 @@ dissect_gprscdr_ChChSelectionMode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
}
static int
dissect_gprscdr_DynamicAddressFlag(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_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, NULL);
return offset;
}
static const ber_sequence_t SGSNPDPRecordV651_set[] = {
{ &hf_gprscdr_recordType , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_gprscdr_CallEventRecordType },
{ &hf_gprscdr_networkInitiation, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_gprscdr_NetworkInitiatedPDPContext },
@ -2298,32 +2324,9 @@ dissect_gprscdr_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_gprscdr_PLMN_Id(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 122 "./asn1/gprscdr/gprscdr.cnf"
tvbuff_t *parameter_tvb;
proto_tree *subtree;
offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
&parameter_tvb);
if (!parameter_tvb)
return offset;
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);
return offset;
}
static int
dissect_gprscdr_T_userLocationInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 163 "./asn1/gprscdr/gprscdr.cnf"
#line 167 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -2588,7 +2591,7 @@ dissect_gprscdr_PSFurnishChargingInformation(gboolean implicit_tag _U_, tvbuff_t
static int
dissect_gprscdr_T_userLocationInformation_02(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 171 "./asn1/gprscdr/gprscdr.cnf"
#line 175 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -2797,7 +2800,7 @@ dissect_gprscdr_GPRSCallEventRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
static int
dissect_gprscdr_T_userLocationInformation_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 167 "./asn1/gprscdr/gprscdr.cnf"
#line 171 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -2854,7 +2857,7 @@ dissect_gprscdr_GGSNPDPRecordV750(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_gprscdr_T_userLocationInformation_03(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 175 "./asn1/gprscdr/gprscdr.cnf"
#line 179 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -2976,7 +2979,7 @@ dissect_gprscdr_SEQUENCE_OF_AFRecordInformation(gboolean implicit_tag _U_, tvbuf
static int
dissect_gprscdr_T_userLocationInformation_05(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 183 "./asn1/gprscdr/gprscdr.cnf"
#line 187 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 1);
@ -3177,7 +3180,7 @@ dissect_gprscdr_ChangeCondition(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_gprscdr_T_userLocationInformation_08(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 203 "./asn1/gprscdr/gprscdr.cnf"
#line 207 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -3190,7 +3193,7 @@ dissect_gprscdr_T_userLocationInformation_08(gboolean implicit_tag _U_, tvbuff_t
static int
dissect_gprscdr_T_aRP(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 146 "./asn1/gprscdr/gprscdr.cnf"
#line 150 "./asn1/gprscdr/gprscdr.cnf"
proto_tree *ext_tree_arp;
guint length;
@ -3358,7 +3361,7 @@ dissect_gprscdr_UWANUserLocationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U
static int
dissect_gprscdr_T_userLocationInformation_10(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 211 "./asn1/gprscdr/gprscdr.cnf"
#line 215 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -3422,18 +3425,17 @@ dissect_gprscdr_PresenceReportingAreaElementsList(gboolean implicit_tag _U_, tvb
}
static const value_string gprscdr_PresenceReportingAreaNode_vals[] = {
{ 0, "oCS" },
{ 1, "pCRF" },
{ 2, "oCSandPCRF" },
{ 0, NULL }
static const int * PresenceReportingAreaNode_bits[] = {
&hf_gprscdr_PresenceReportingAreaNode_oCS,
&hf_gprscdr_PresenceReportingAreaNode_pCRF,
NULL
};
static int
dissect_gprscdr_PresenceReportingAreaNode(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);
offset = dissect_ber_bitstring(implicit_tag, actx, tree, tvb, offset,
PresenceReportingAreaNode_bits, 2, hf_index, ett_gprscdr_PresenceReportingAreaNode,
NULL);
return offset;
}
@ -3920,7 +3922,7 @@ dissect_gprscdr_GGSNMBMSRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
static int
dissect_gprscdr_T_userLocationInformation_06(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 187 "./asn1/gprscdr/gprscdr.cnf"
#line 191 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -3955,7 +3957,7 @@ dissect_gprscdr_SEQUENCE_OF_ServingNodeType(gboolean implicit_tag _U_, tvbuff_t
static int
dissect_gprscdr_T_lastUserLocationInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 191 "./asn1/gprscdr/gprscdr.cnf"
#line 195 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -4118,7 +4120,7 @@ dissect_gprscdr_SGWRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
static int
dissect_gprscdr_T_userLocationInformation_07(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 195 "./asn1/gprscdr/gprscdr.cnf"
#line 199 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -4183,7 +4185,7 @@ dissect_gprscdr_ServiceConditionChange(gboolean implicit_tag _U_, tvbuff_t *tvb
static int
dissect_gprscdr_T_userLocationInformation_09(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 207 "./asn1/gprscdr/gprscdr.cnf"
#line 211 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -4220,7 +4222,7 @@ dissect_gprscdr_ADCRuleBaseName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
static int
dissect_gprscdr_T_userLocationInformation_11(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 215 "./asn1/gprscdr/gprscdr.cnf"
#line 219 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -4421,7 +4423,7 @@ dissect_gprscdr_SEQUENCE_OF_ChangeOfServiceCondition(gboolean implicit_tag _U_,
static int
dissect_gprscdr_T_lastUserLocationInformation_01(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 199 "./asn1/gprscdr/gprscdr.cnf"
#line 203 "./asn1/gprscdr/gprscdr.cnf"
offset = dissect_gprscdr_uli(tvb, actx, tree, 2);
@ -4915,7 +4917,7 @@ static const ber_choice_t GPRSRecord_choice[] = {
int
dissect_gprscdr_GPRSRecord(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 246 "./asn1/gprscdr/gprscdr.cnf"
#line 250 "./asn1/gprscdr/gprscdr.cnf"
proto_item *item;
gint branch_taken, t_offset = offset;
gint32 tag;
@ -5133,6 +5135,10 @@ proto_register_gprscdr(void)
{ "mBMSDataTransferStop", "gprscdr.mBMSDataTransferStop",
FT_BYTES, BASE_NONE, NULL, 0,
"MBMSTime", HFILL }},
{ &hf_gprscdr_iPAddress,
{ "iPAddress", "gprscdr.iPAddress",
FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_sCSAddress,
{ "sCSAddress", "gprscdr.sCSAddress",
FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
@ -6337,10 +6343,6 @@ proto_register_gprscdr(void)
{ "counterTimestamp", "gprscdr.counterTimestamp",
FT_BYTES, BASE_NONE, NULL, 0,
"TimeStamp", HFILL }},
{ &hf_gprscdr_iPAddress,
{ "iPAddress", "gprscdr.iPAddress",
FT_UINT32, BASE_DEC, VALS(gprscdr_IPAddress_vals), 0,
NULL, HFILL }},
{ &hf_gprscdr_presenceReportingAreaIdentifier,
{ "presenceReportingAreaIdentifier", "gprscdr.presenceReportingAreaIdentifier",
FT_BYTES, BASE_NONE, NULL, 0,
@ -6351,7 +6353,7 @@ proto_register_gprscdr(void)
NULL, HFILL }},
{ &hf_gprscdr_presenceReportingAreaNode,
{ "presenceReportingAreaNode", "gprscdr.presenceReportingAreaNode",
FT_UINT32, BASE_DEC, VALS(gprscdr_PresenceReportingAreaNode_vals), 0,
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }},
{ &hf_gprscdr_pSFreeFormatData,
{ "pSFreeFormatData", "gprscdr.pSFreeFormatData",
@ -6661,6 +6663,14 @@ proto_register_gprscdr(void)
{ "envelopeClosure", "gprscdr.ServiceConditionChangeV750.envelopeClosure",
FT_BOOLEAN, 8, NULL, 0x08,
NULL, HFILL }},
{ &hf_gprscdr_PresenceReportingAreaNode_oCS,
{ "oCS", "gprscdr.PresenceReportingAreaNode.oCS",
FT_BOOLEAN, 8, NULL, 0x80,
NULL, HFILL }},
{ &hf_gprscdr_PresenceReportingAreaNode_pCRF,
{ "pCRF", "gprscdr.PresenceReportingAreaNode.pCRF",
FT_BOOLEAN, 8, NULL, 0x40,
NULL, HFILL }},
{ &hf_gprscdr_ServiceConditionChange_qoSChange,
{ "qoSChange", "gprscdr.ServiceConditionChange.qoSChange",
FT_BOOLEAN, 8, NULL, 0x80,
@ -6843,6 +6853,7 @@ proto_register_gprscdr(void)
&ett_gprscdr_LocationAreaAndCell,
&ett_gprscdr_ManagementExtensions,
&ett_gprscdr_MBMSInformation,
&ett_gprscdr_PDPAddress,
&ett_gprscdr_SCSASAddress,
&ett_gprscdr_ServiceSpecificInfo,
&ett_gprscdr_SubscriptionID,
@ -6909,8 +6920,8 @@ proto_register_gprscdr(void)
&ett_gprscdr_Flows,
&ett_gprscdr_T_flowNumber,
&ett_gprscdr_MOExceptionDataCounter,
&ett_gprscdr_PDPAddress,
&ett_gprscdr_PresenceReportingAreaInfo,
&ett_gprscdr_PresenceReportingAreaNode,
&ett_gprscdr_PSFurnishChargingInformation,
&ett_gprscdr_RANSecondaryRATUsageReport,
&ett_gprscdr_RelatedChangeOfCharCondition,