diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-07-31 13:49:39 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-07-31 13:49:39 +0000 |
| commit | 796bbde5d3fd4fb38df3b5125260be2718d29d60 (patch) | |
| tree | df9bf7642a586f06a0c7b44f8c1a55406809eab2 /asn1 | |
| parent | baabe8b1910e59afaeec7282b5147ba53e18237d (diff) | |
- Put back not used constants to fill value_strings_ext.
- Don't dissect RRC container, it seems to only cause grief.
svn path=/trunk/; revision=44156
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ranap/RANAP-Constants.asn | 9 | ||||
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 2 | ||||
| -rw-r--r-- | asn1/ranap/ranap.cnf | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/asn1/ranap/RANAP-Constants.asn b/asn1/ranap/RANAP-Constants.asn index 5238205fef..353e87388f 100644 --- a/asn1/ranap/RANAP-Constants.asn +++ b/asn1/ranap/RANAP-Constants.asn @@ -35,6 +35,7 @@ id-RelocationCancel INTEGER ::= 4 id-SRNS-ContextTransfer INTEGER ::= 5 id-SecurityModeControl INTEGER ::= 6 id-DataVolumeReport INTEGER ::= 7 +id-Not-Used-8 INTEGER ::= 8 id-Reset INTEGER ::= 9 id-RAB-ReleaseRequest INTEGER ::= 10 id-Iu-ReleaseRequest INTEGER ::= 11 @@ -131,6 +132,8 @@ maxNrOfLAIs INTEGER ::= 8 -- ************************************************************** id-AreaIdentity INTEGER ::= 0 +id-Not-Used-1 INTEGER ::= 1 +id-Not-Used-2 INTEGER ::= 2 id-CN-DomainIndicator INTEGER ::= 3 id-Cause INTEGER ::= 4 id-ChosenEncryptionAlgorithm INTEGER ::= 5 @@ -201,6 +204,8 @@ id-UE-ID INTEGER ::= 69 id-UL-GTP-PDU-SequenceNumber INTEGER ::= 70 id-RAB-FailedtoReportItem INTEGER ::= 71 id-RAB-FailedtoReportList INTEGER ::= 72 +id-Not-Used-73 INTEGER ::= 73 +id-Not-Used-74 INTEGER ::= 74 id-KeyStatus INTEGER ::= 75 id-DRX-CycleLengthCoefficient INTEGER ::= 76 id-IuSigConIdList INTEGER ::= 77 @@ -227,6 +232,8 @@ id-LastKnownServiceArea INTEGER ::= 97 id-SRB-TrCH-Mapping INTEGER ::= 98 id-InterSystemInformation-TransparentContainer INTEGER ::= 99 id-NewBSS-To-OldBSS-Information INTEGER ::= 100 +id-Not-Used-101 INTEGER ::= 101 +id-Not-Used-102 INTEGER ::= 102 id-SourceRNC-PDCP-context-info INTEGER ::= 103 id-InformationTransferID INTEGER ::= 104 id-SNA-Access-Information INTEGER ::= 105 @@ -356,6 +363,7 @@ id-SRVCC-Operation-Possible INTEGER ::= 228 id-CSG-Id-List INTEGER ::= 229 id-PSRABtobeReplaced INTEGER ::= 230 id-E-UTRAN-Service-Handover INTEGER ::= 231 +id-Not-Used-232 INTEGER ::= 232 id-UE-AggregateMaximumBitRate INTEGER ::= 233 id-CSG-Membership-Status INTEGER ::= 234 id-Cell-Access-Mode INTEGER ::= 235 @@ -369,6 +377,7 @@ id-Correlation-ID INTEGER ::= 242 id-IRAT-Measurement-Configuration INTEGER ::= 243 id-MDT-Configuration INTEGER ::= 244 id-Priority-Class-Indicator INTEGER ::= 245 +id-Not-Used-246 INTEGER ::= 246 id-RNSAPRelocationParameters INTEGER ::= 247 id-RABParametersList INTEGER ::= 248 id-Management-Based-MDT-Allowed INTEGER ::= 249 diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 43501d28ee..43d90540dc 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -88,7 +88,7 @@ static int ett_ranap_TransportLayerAddress_nsap = -1; static guint32 ProcedureCode; static guint32 ProtocolIE_ID; static guint32 ProtocolExtensionID; - +static gboolean glbl_dissect_container = FALSE; /* Some IE:s identities uses the same value for different IE:s * depending on PDU type: * InitiatingMessage diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 67734f6a18..294791a6e3 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -224,7 +224,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") %(DEFAULT_BODY)s - if ((rrc_message_tvb)&&(tvb_length(rrc_message_tvb)!=0)){ + if ((rrc_message_tvb)&&(tvb_length(rrc_message_tvb)!=0)&&(glbl_dissect_container)){ switch(ProtocolIE_ID){ case id_Source_ToTarget_TransparentContainer: /* INTEGER ::= 61 */ /* 9.2.1.30a Source to Target Transparent Container |