From LEGO via bug 4405:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 1 Mar 2010 22:11:20 +0000 (22:11 +0000)
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Mon, 1 Mar 2010 22:11:20 +0000 (22:11 +0000)
Add the dot ('.') to the characters that can compose a name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32068 f5534014-38df-0310-8fa8-9805f1628bb7

32 files changed:
asn1/HI2Operations/HI2Operations.cnf [new file with mode: 0644]
asn1/dap/dap.cnf
asn1/dsp/dsp.cnf
asn1/hnbap/HNBAP-CommonDataTypes.asn
asn1/hnbap/HNBAP-Constants.asn
asn1/hnbap/HNBAP-Containers.asn
asn1/hnbap/HNBAP-IEs.asn
asn1/hnbap/HNBAP-PDU-Contents.asn
asn1/hnbap/HNBAP-PDU-Descriptions.asn
asn1/hnbap/hnbap.cnf
asn1/inap/IN-errorcodes.asn
asn1/inap/IN-errortypes.asn
asn1/inap/Makefile.common
asn1/inap/inap.cnf
asn1/inap/packet-inap-template.c
asn1/rrc/rrc.cnf
asn1/rua/rua.cnf
epan/CMakeLists.txt
epan/Makefile.nmake
epan/dissectors/packet-6lowpan.c
epan/dissectors/packet-HI2Operations.c
epan/dissectors/packet-dap.c
epan/dissectors/packet-dap.h
epan/dissectors/packet-dsp.c
epan/dissectors/packet-dsp.h
epan/dissectors/packet-gsm_a_rp.c
epan/dissectors/packet-hnbap.c
epan/dissectors/packet-inap.c
epan/dissectors/packet-inap.h
epan/dissectors/packet-rrc.c
epan/dissectors/packet-rua.c
epan/dissectors/packet-xml.c

diff --git a/asn1/HI2Operations/HI2Operations.cnf b/asn1/HI2Operations/HI2Operations.cnf
new file mode 100644 (file)
index 0000000..b2c8dbc
--- /dev/null
@@ -0,0 +1,38 @@
+# HI2Operations.cnf
+# HI2Operations conformation file
+
+# $Id$
+
+#.MODULE
+UmtsHI2Operations UmtsHI2
+PCESP PCESP
+TS101909201 TS101909201
+EN301040       EN301040
+#.MODULE_IMPORT
+
+#.EXPORTS
+
+#.REGISTER
+
+#.PDU
+IRIsContent
+
+#.NO_EMIT
+
+#.OMIT_ASSIGNMENT
+# Get rid of unused code warnings
+TTRAFFIC
+CTTRAFFIC
+LIACTIVATEreq
+LIACTIVATEconf
+LIMODIFYreq
+LIMODIFYconf
+LISTATUSind
+StatusType
+
+#.TYPE_RENAME
+
+#.FIELD_RENAME
+
+#.END
+
index b69c7124cb7f3f9dd064b449acc8b2f0c0f126bf..dcfe5e54d206ba296c36be14886c7570ef8374e1 100644 (file)
@@ -74,7 +74,6 @@ CommonResultsSeq
 #.EXPORTS
 Filter
 Referral
-SecurityParameters
 EntryModification
 ContextSelection
 DirectoryBindArgument
@@ -103,6 +102,8 @@ ServiceError
 Abandoned
 SearchControlOptions 
 SecurityError
+SecurityProblem
+SecurityParameters
 ServiceControlOptions
 AbandonFailedError
 UpdateError
index a5ee1386e2ac25d43d25a21764c058b7d6afb0dc..bbd36440dfdbda1988feb2ac4111f61a5e30248c 100644 (file)
@@ -8,13 +8,13 @@ ServiceAdministration         x509if
 #.IMPORT       ../x509sat/x509sat-exp.cnf
 
 #.EXPORTS
-OperationProgress
-ReferenceType
-ContinuationReference
 AccessPoint
-MasterAndShadowAccessPoints 
+AccessPointInformation
+ContinuationReference
 Exclusions
-
+MasterAndShadowAccessPoints 
+OperationProgress
+ReferenceType
 #.TYPE_RENAME
 
 MasterOrShadowAccessPoint/category     APCategory
index 55147e5cd89e0235c060994b82bdb5fdef14ec4f..aaf4a3e787f7b9595a3354be19f8cff7741ff1d3 100644 (file)
@@ -1,6 +1,6 @@
 -- HNBAP-CommonDataTypes.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.5       Common Definitions
index 23ddfb639d8d02d77977c7557a2dc4278dd62fe1..c8785bfe46dde8229fc564fd087a8f8b8bf599aa 100644 (file)
@@ -1,6 +1,6 @@
 -- HNBAP-Constants.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.6       Constant Definitions
@@ -71,7 +71,11 @@ id-UE-Capabilities                                                           ProtocolIE-ID ::= 13
 id-RNC-ID                                                                              ProtocolIE-ID ::= 14
 id-CSG-ID                                                                              ProtocolIE-ID ::= 15
 id-BackoffTimer                                                                        ProtocolIE-ID ::= 16
-id-HNB-Internet-Information                                                     ProtocolIE-ID ::= 17
+id-HNB-Internet-Information                                            ProtocolIE-ID ::= 17
+id-HNB-Cell-Access-Mode                                                        ProtocolIE-ID ::= 18
+id-MuxPortNumber                                ProtocolIE-ID ::= 19
+id-Service-Area-For-Broadcast                                  ProtocolIE-ID ::= 20
+id-CSGMembershipStatus                                                 ProtocolIE-ID ::= 21
 
 
 
index b7a7f34ec93db697378a7c2c499f01d1024a65b1..e17821acdfad84903db6c1c37e7280ac09ce7a0f 100644 (file)
@@ -156,4 +156,4 @@ PrivateIE-Field {HNBAP-PRIVATE-IES : IEsSetParam} ::= SEQUENCE {
        value                           HNBAP-PRIVATE-IES.&Value                                ({IEsSetParam}{@id})
 }
 
-END
\ No newline at end of file
+END
index b32cdc7c4bc17e24b2e4aa374b48bac61de7c1cb..f5502a25f32b1c76f70b7fa384baec25928e4f11 100644 (file)
@@ -1,6 +1,6 @@
 -- HNBAP-IEs.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.4       Information Element Definitions
@@ -143,6 +143,12 @@ CSG-Indicator      ::=     ENUMERATED {
                                ...
                        }
 
+CSGMembershipStatus ::= ENUMERATED { 
+       member, 
+       non-member,
+       ...
+}
+
 CGI ::= SEQUENCE {
        pLMNidentity            PLMNidentity,
        lAC                                     LAC,
@@ -190,6 +196,14 @@ GeographicalCoordinates-ExtIEs HNBAP-PROTOCOL-EXTENSION ::= {
 }
 
 --H
+
+HNB-Cell-Access-Mode::= ENUMERATED {
+       closed,
+       hybrid,
+       open,
+       ... 
+}
+
 HNB-Location-Information       ::=     SEQUENCE        {
        macroCoverageInfo               MacroCoverageInformation        OPTIONAL,
        geographicalCoordinates GeographicalLocation    OPTIONAL,
@@ -282,6 +296,8 @@ MacroCellID ::= CHOICE {
        ...
 }
 
+MuxPortNumber ::= INTEGER (1024..65535)
+
 --N
 --O
 --P
index 4fd3896431b3fb6593de5c74eedd3e2012e2f09f..9b229e4eeff51af67fc5c082519ed73d05cc489f 100644 (file)
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Contents.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.3       PDU Definitions
@@ -30,7 +30,8 @@ BEGIN
 
 IMPORTS
        Cause,
-       CriticalityDiagnostics,
+       CriticalityDiagnostics, 
+       CSGMembershipStatus,
        HNB-Location-Information,
        HNB-Identity,
        Context-ID,
@@ -46,7 +47,10 @@ IMPORTS
        CellIdentity,
        RNC-ID,
        CSG-ID,
-       BackoffTimer
+       HNB-Cell-Access-Mode,
+       BackoffTimer,
+       MuxPortNumber
+
 
 
 FROM HNBAP-IEs
@@ -64,7 +68,8 @@ FROM HNBAP-IEs
 FROM HNBAP-Containers
 
        id-Cause,
-       id-CriticalityDiagnostics,
+       id-CriticalityDiagnostics, 
+       id-CSGMembershipStatus,
        id-HNB-Location-Information,
        id-HNB-Identity,
        id-Context-ID,
@@ -78,7 +83,11 @@ FROM HNBAP-Containers
        id-CellIdentity,
        id-RNC-ID,
        id-CSG-ID,
-       id-BackoffTimer
+       id-HNB-Cell-Access-Mode,
+       id-BackoffTimer,
+       id-Service-Area-For-Broadcast,
+       id-MuxPortNumber
+
 
 FROM HNBAP-Constants;
 
@@ -107,6 +116,8 @@ HNBRegisterRequestIEs HNBAP-PROTOCOL-IES ::= {
 }
 
 HNBRegisterRequestExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+       { ID id-Service-Area-For-Broadcast              CRITICALITY ignore      EXTENSION SAC   PRESENCE optional }|
+       { ID id-HNB-Cell-Access-Mode                    CRITICALITY reject      EXTENSION HNB-Cell-Access-Mode                          PRESENCE optional},
        ...
 }
 
@@ -129,6 +140,8 @@ HNBRegisterResponseIEs HNBAP-PROTOCOL-IES ::= {
 
 
 HNBRegisterResponseExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+-- Extension for Release 9 to support CS Multiplexing --
+    {ID id-MuxPortNumber           CRITICALITY ignore  EXTENSION MuxPortNumber      PRESENCE optional},
        ...
 }
 
@@ -225,6 +238,7 @@ UERegisterAcceptIEs HNBAP-PROTOCOL-IES ::= {
 
 
 UERegisterAcceptExtensions HNBAP-PROTOCOL-EXTENSION ::= {
+       { ID id-CSGMembershipStatus             CRITICALITY      reject         EXTENSION CSGMembershipStatus                   PRESENCE optional       },
        ...
 }
 
index 43d739875f1bba7d708867472d0c4b850e08dc9c..b1fd9f8d1db40d34cc45fc6710c702ae104e2d67 100644 (file)
@@ -1,6 +1,6 @@
 -- HNBAP-PDU-Descriptions.asn
 --
--- 3GPP TS 25.469 V8.4.0 (2009-12)
+-- 3GPP TS 25.469 V9.0.0 (2009-12)
 -- http://www.3gpp.org/ftp/Specs/html-info/25469.htm
 --
 -- 9.3.2       Elementary Procedure definitions
index cec6103d97a621e9f167060130520f153db74d92..8ca3604994e38717edc5d231661f949ebd6f8036 100644 (file)
@@ -39,6 +39,8 @@ HNB-Location-Information/geographicalCoordinates hnb_location_information_geogra
 #.OMIT_ASSIGNMENT
 Presence
 ProtocolIE-ContainerList
+ProtocolIE-Single-Container
+CN-DomainIndicator
 #.END
 
 #.FN_PARS ProtocolIE-ID  VAL_PTR = &ProtocolIE_ID
@@ -86,8 +88,11 @@ CSG-ID                                               N hnbap.ies id-CSG-ID
 BackoffTimer                           N hnbap.ies id-BackoffTimer
 
 #HNBAP-PROTOCOL-EXTENSION
-IP-Address     N hnbap.extension id-HNB-Internet-Information
-
+IP-Address                                     N hnbap.extension id-HNB-Internet-Information
+HNB-Cell-Access-Mode           N hnbap.extension id-HNB-Cell-Access-Mode
+MuxPortNumber                          N hnbap.extension id-MuxPortNumber
+SAC                                                    N hnbap.extension id-Service-Area-For-Broadcast
+CSGMembershipStatus                    N hnbap.extension id-CSGMembershipStatus
 
 #HNBAP-ELEMENTARY-PROCEDURE
 HNBRegisterRequest                                                     N hnbap.proc.imsg id-HNBRegister
index 1cffe33d7b02953b609843985e787419063040a1..44ac686655896efccac5af3b49c1e38f45515b06 100644 (file)
@@ -44,14 +44,13 @@ errcode-unknownLegID Code ::= local:17
 errcode-unknownResource Code ::= local:18
 
 -- Error codes for the IN CS2 error types follow 
-errcode-scfReferral Code ::=
-  local:21
+errcode-scfReferral Code ::= local:21
 
 errcode-scfTaskRefused Code ::= local:22
 
 errcode-chainingRefused Code ::= local:23
-
-errcode-executionError Code ::= local:10
+-- WS:Duplicate
+--errcode-executionError Code ::= local:10
 
 END
 
index 265e9328f140487f07f0a8ab285413d955aeb6e8..3ba2e733f8692db7c3da67a8ae2c429f8dde8664 100644 (file)
@@ -57,17 +57,18 @@ eTCFailed ERROR ::= {CODE  errcode-eTCFailed
 }
 
 -- The establish temporary connection failed.
-executionError ERROR ::= {
-  PARAMETER OPTIONALLY-PROTECTED
-    {SET {problem  [0] EXPLICIT ExecutionProblem,
-          COMPONENTS OF CommonResults},
-     dirqop.&dirErrors-QOP}
-  CODE                            errcode-executionError
-}
+-- WS:Duplicates error-code
+--executionError ERROR ::= {
+--  PARAMETER OPTIONALLY-PROTECTED
+--    {SET {problem  [0] EXPLICIT ExecutionProblem,
+--          COMPONENTS OF CommonResults}
+--     dirqop.&dirErrors-QOP},
+--  CODE                            errcode-executionError
+--}
 
 -- The executionError is returned by an Execute operation in the case of the operation is not completing.
-ExecutionProblem ::= INTEGER {missingInputValues(1), executionFailure(2)
-}
+--ExecutionProblem ::= INTEGER {missingInputValues(1), executionFailure(2)
+--}
 
 -- The executeProblem identifies the cause of the execute operation failure:
 -- missingInputValues is returned in the input-values field contains the wrong input 
@@ -99,16 +100,17 @@ requestedInfoError ERROR ::= {
 }
 
 -- The requested information cannot be found.
-scfBindFailure ERROR ::= {PARAMETER  FailureReason
-}
-
-FailureReason ::= CHOICE {
-  systemFailure   [0]  UnavailableNetworkResource,
-  scfTaskRefused  [1]  ScfTaskRefusedParameter,
-  securityError
-    [2]  SET {problem   [0]  SecurityProblem,
-              spkmInfo  [1]  SPKM-ERROR}
-}
+-- WS:CODE missing comment it out
+--scfBindFailure ERROR ::= {PARAMETER  FailureReason
+--}
+
+--FailureReason ::= CHOICE {
+--  systemFailure   [0]  UnavailableNetworkResource,
+--  scfTaskRefused  [1]  ScfTaskRefusedParameter,
+--  securityError
+--    [2]  SET {problem   [0]  SecurityProblem,
+--              spkmInfo  [1]  SPKM-ERROR}
+--}
 
 scfTaskRefused ERROR ::= {
   PARAMETER  ScfTaskRefusedParameter
@@ -116,13 +118,13 @@ scfTaskRefused ERROR ::= {
 }
 
 ScfTaskRefusedParameter ::=
-  OPTIONALLY-PROTECTED
-    {SEQUENCE {reason
+--  OPTIONALLY-PROTECTED
+    SEQUENCE {reason
                  ENUMERATED {generic(0), unobtainable(1), congestion(2)
                                                           --other values FFS
                                                           },
                securityParameters  [1]  SecurityParameters OPTIONAL
-    }, scfqop.&scfErrorsQOP}
+    }--, scfqop.&scfErrorsQOP}
 
 scfReferral ERROR ::= {
   PARAMETER  ReferralParameter
@@ -130,10 +132,10 @@ scfReferral ERROR ::= {
 }
 
 ReferralParameter ::=
-  OPTIONALLY-PROTECTED
-    {SEQUENCE {tryhere             [0]  AccessPointInformation,
+--  OPTIONALLY-PROTECTED
+    SEQUENCE {tryhere             [0]  AccessPointInformation,
                securityParameters  [1]  SecurityParameters OPTIONAL
-    }, scfqop.&scfErrorsQOP}
+    }--, scfqop.&scfErrorsQOP}
 
 systemFailure ERROR ::= {
   PARAMETER  UnavailableNetworkResource
@@ -153,13 +155,14 @@ taskRefused ERROR ::= {
 -- An entity normally capable of the task requested cannot or chooses not to perform the task at this 
 -- time. This includes error situations like congestion and unobtainable address as used in e.g. the 
 -- connect operation.
-tfcBindError ERROR ::= {
-  PARAMETER
-    SET {versions  [0]  Versions DEFAULT {v1},
-         error
-           CHOICE {serviceError   [1]  ServiceProblem,
-                   securityError  [2]  SecurityProblem}}
-}
+-- WS:CODE missing comment it out
+-- tfcBindError ERROR ::= {
+--   PARAMETER
+--     SET {versions  [0]  Versions DEFAULT {v1},
+--          error
+--            CHOICE {serviceError   [1]  ServiceProblem,
+--                    securityError  [2]  SecurityProblem}}
+-- }
 
 unavailableResource ERROR ::= {CODE  errcode-unavailableResource
 }
index a632d3067d657139a8b506f90ad31a65633aff3a..92ffba11d8e1230db77f343ea3df91f6b0d33fbc 100644 (file)
@@ -54,7 +54,9 @@ ASN_FILE_LIST= \
        $(1248_CLASSES_ASN) \
        $(1248_1_ASN_FILES) \
        $(1248_2_ASN_FILES) \
-       $(1248_3_ASN_FILES)
+       $(1248_3_ASN_FILES) \
+       IN-errorcodes.asn       \
+       IN-errortypes.asn
 
 # The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn
 # files do not exist for all protocols: Please add/remove as required.
@@ -65,6 +67,16 @@ EXTRA_DIST = \
        packet-$(PROTOCOL_NAME)-template.h \
        $(PROTOCOL_NAME).cnf
 
+EXTRA_CNF= \
+       ../dap/dap-exp.cnf \
+       ../dsp/dsp-exp.cnf
+       
+../dap/dap-exp.cnf:
+       (cd ../dap && $(MAKE_CNF_EXPORT))       
+
+../dsp/dsp-exp.cnf:
+       (cd ../dsp && $(MAKE_CNF_EXPORT))       
+
 SRC_FILES = \
        $(EXTRA_DIST) \
        $(EXT_ASN_FILE_LIST)
index 333d7d5e3b48128ef09ca6cf20ae88a586ee6708..71daa29ba0c109b84da66d56aa969753e0a32fb8 100644 (file)
@@ -2,6 +2,9 @@
 # inap conformation file
 # $Id$
 
+#.IMPORT ../dap/dap-exp.cnf
+#.IMPORT ../dsp/dsp-exp.cnf
+
 #.EXPORTS
 BothwayThroughConnectionInd
 CallingPartysCategory
@@ -15,17 +18,12 @@ MiscCallInfo
 RedirectionInformation
 ServiceKey
 
-#.PDU_NEW
-#ERROR.&ParameterType
-#OPERATION.&ArgumentType
-#OPERATION.&ResultType
-#.END
-
 #.NO_EMIT
 
 #.OMIT_ASSIGNMENT
 # Removed as they are giving 'defined but not used' warnings currently.
 Priority
+RejectProblem
 #.END
 
 #.TYPE_RENAME
index 38ef917943545ede4aef87f2dca1102d4644c554..4d91a38ac1fc71dede85c68f1b2c680198e94ce3 100644 (file)
@@ -45,6 +45,8 @@
 #include "packet-e164.h"
 #include "packet-isup.h"
 #include "packet-tcap.h"
+#include "packet-dap.h"
+#include "packet-dsp.h"
 
 #define PNAME  "Intelligent Network Application Protocol"
 #define PSNAME "INAP"
index b34076e41784e5be3e6e35d12b8394215ef3d327..8918edff58e887ee86766c3962ac42eeb863ce3a 100644 (file)
@@ -20,6 +20,10 @@ GSMCellGroupingList
 MeasuredResultOnSecULFreq
 TriggeringCondition3
 UE-Positioning-GANSS-Data
+GANSSDecipheringKeys
+GSM-CellID
+IntraFrequencyMeasuredResultsListOnSecULFreq
+CellMeasuredResultsListOnSecULFreq
 #.END
 
 #.PDU
index 1d830f240942c3fe72a03529649b1edb28d0c8b5..79b5455d8661a5e5d6394e241a0051b400008738 100644 (file)
@@ -34,6 +34,7 @@ PrivateIE-Field/id private_ie_field_id
 #.OMIT_ASSIGNMENT
 Presence
 ProtocolIE-ContainerList
+ProtocolIE-Single-Container
 #.END
 
 #.FN_PARS ProtocolIE-ID  VAL_PTR = &ProtocolIE_ID
index 3c1cade3552721a3809b938971193a7ca4ddaacc..4440df3e53b5e66bd6051a1bbb367d2652bed8e3 100644 (file)
@@ -261,6 +261,7 @@ set(DIRTY_ASN1_DISSECTOR_SRC
        dissectors/packet-ansi_map.c
        dissectors/packet-gnm.c
        dissectors/packet-gsm_map.c
+       dissectors/packet-HI2Operations.c
        dissectors/packet-hnbap.c
        dissectors/packet-inap.c
        dissectors/packet-ldap.c
index 9e4f9988ba86738160aaa22c1fac86fdcac4b46c..af94e5b63c8c9f5aa6fdacfae1e63d38690453dd 100644 (file)
@@ -67,8 +67,6 @@ EXTRA_OBJECTS = \
        asm_utils.obj
 !ENDIF
 
-
-
 !IFDEF DOXYGEN
 DOXYGEN_DEP=doxygen
 !ENDIF
@@ -222,30 +220,46 @@ exntest: exntest.exe
 reassemble_test: reassemble_test.exe
 tvbtest: tvbtest.exe
 
+# Object files for exntest
+EXNTEST_OBJ=exntest.obj except.obj
 
-
-exntest.exe: exntest.obj except.obj
+exntest.exe: $(EXNTEST_OBJ)
        @echo Linking $@
        $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
-               $(GLIB_LIBS) exntest.obj except.obj
+               $(GLIB_LIBS) $(EXNTEST_OBJ)
 !IF $(MSC_VER_REQUIRED) >= 1400
        mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
 !ENDIF
 
-tvbtest.exe: tvbtest.obj tvbuff.obj except.obj to_str.obj strutil.obj emem.obj
+# Object files for tvbtest
+TVBTEST_OBJ=tvbtest.obj \
+       tvbuff.obj \
+       except.obj \
+       to_str.obj \
+       strutil.obj \
+       emem.obj
+
+tvbtest.exe: $(TVBTEST_OBJ)
        @echo Linking $@
        $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
-               $(GLIB_LIBS) $(ZLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj
+               $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ)
 !IF $(MSC_VER_REQUIRED) >= 1400
        mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
 !ENDIF
 
-reassemble_test.exe: reassemble_test.obj tvbuff.obj except.obj to_str.obj strutil.obj emem.obj \
-                 reassemble.obj
+# Object files for reassemble_test
+REASSEMBLE_TEST_OBJ=reassemble_test.obj \
+       tvbuff.obj \
+       except.obj \
+       to_str.obj \
+       strutil.obj \
+       emem.obj \
+       reassemble.obj
+
+reassemble_test.exe: $(REASSEMBLE_TEST_OBJ)
        @echo Linking $@
        $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
-                $(GLIB_LIBS) $(ZLIB_LIBS) reassemble_test.obj tvbuff.obj \
-                except.obj strutil.obj emem.obj reassemble.obj
+                $(GLIB_LIBS) $(ZLIB_LIBS) $(REASSEMBLE_TEST_OBJ)
 !IF $(MSC_VER_REQUIRED) >= 1400
        mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
 !ENDIF
index b7c264219c0733e755f973c8c5f9675476723abc..b20a4337fce69ece54e3611ac056b0b67653752f 100644 (file)
@@ -542,7 +542,7 @@ lowpan_dldst_to_ifcid(packet_info *pinfo, guint8 *ifcid)
         ifcid[0] ^= 0x02;
         return TRUE;
     }
-    if (packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
+    if (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) {
         lowpan_addr16_to_ifcid(packet->dst.addr16, packet->dst_pan, ifcid);
         return TRUE;
     }
index 183ce9957f4549ef713d95be6bd3016e4a7f86e3..04c0a93cff6729b80e7f1b3096c1ac74efb568ff 100644 (file)
@@ -240,9 +240,6 @@ static int hf_HI2Operations_iRITransaction = -1;  /* IRITransactionType */
 static int hf_HI2Operations_iRITransactionNumber = -1;  /* INTEGER */
 static int hf_HI2Operations_userSignal = -1;      /* UserSignalType */
 static int hf_HI2Operations_cryptoCheckSum = -1;  /* BIT_STRING */
-static int hf_HI2Operations_trafficPacket = -1;   /* BIT_STRING */
-static int hf_HI2Operations_cryptoChecksum = -1;  /* BIT_STRING */
-static int hf_HI2Operations_correspondentCount = -1;  /* INTEGER */
 static int hf_HI2Operations_copySignal = -1;      /* BIT_STRING */
 static int hf_HI2Operations_interpretedSignal = -1;  /* INTEGER */
 static int hf_HI2Operations_cdcPdu = -1;          /* CdcPdu */
@@ -337,21 +334,7 @@ static int hf_HI2Operations_lastRedirectingNumber = -1;  /* VisibleString_SIZE_1
 static int hf_HI2Operations_redirectingName = -1;  /* VisibleString_SIZE_1_40_ */
 static int hf_HI2Operations_redirectingReason = -1;  /* VisibleString_SIZE_1_40_ */
 static int hf_HI2Operations_messageWaitingNotif = -1;  /* VisibleString_SIZE_1_40_ */
-static int hf_HI2Operations_timeStamp_01 = -1;    /* UTCTime */
-static int hf_HI2Operations_invokeId = -1;        /* INTEGER */
-static int hf_HI2Operations_targetAddress = -1;   /* AddressType */
-static int hf_HI2Operations_expiryDateTime = -1;  /* UTCTime */
-static int hf_HI2Operations_targetname = -1;      /* VisibleString */
-static int hf_HI2Operations_additionaltargetdata = -1;  /* VisibleString */
-static int hf_HI2Operations_monitorServiceList = -1;  /* SEQUENCE_OF_ActivityType */
-static int hf_HI2Operations_monitorServiceList_item = -1;  /* ActivityType */
-static int hf_HI2Operations_result = -1;          /* BOOLEAN */
 static int hf_HI2Operations_tLIInstanceid = -1;   /* TLIIdType */
-static int hf_HI2Operations_modificationNumber = -1;  /* INTEGER */
-static int hf_HI2Operations_modificationType = -1;  /* T_modificationType */
-static int hf_HI2Operations_halt = -1;            /* BOOLEAN */
-static int hf_HI2Operations_reset = -1;           /* BOOLEAN */
-static int hf_HI2Operations_tETRASysStatus = -1;  /* StatusType */
 static int hf_HI2Operations_targetLocation_01 = -1;  /* LocationType_en301040 */
 static int hf_HI2Operations_targetAction = -1;    /* ActivityType */
 static int hf_HI2Operations_supplementaryTargetaddress = -1;  /* AddressType */
@@ -363,6 +346,7 @@ static int hf_HI2Operations_targetlocation = -1;  /* LocationType_en301040 */
 static int hf_HI2Operations_targetcommsid = -1;   /* CircuitIdType */
 static int hf_HI2Operations_cotargetcommsid = -1;  /* SEQUENCE_OF_CircuitIdType */
 static int hf_HI2Operations_cotargetcommsid_item = -1;  /* CircuitIdType */
+static int hf_HI2Operations_trafficPacket = -1;   /* BIT_STRING */
 static int hf_HI2Operations_cctivity = -1;        /* ActivityClassType */
 static int hf_HI2Operations_callRelation = -1;    /* T_callRelation */
 static int hf_HI2Operations_direction_01 = -1;    /* T_direction */
@@ -455,8 +439,6 @@ static gint ett_HI2Operations_T_both_IRI_CC = -1;
 static gint ett_HI2Operations_IRI_to_CC_Correlation = -1;
 static gint ett_HI2Operations_T_cc = -1;
 static gint ett_HI2Operations_TARGETACTIVITYMONITOR_1 = -1;
-static gint ett_HI2Operations_TTRAFFIC = -1;
-static gint ett_HI2Operations_CTTRAFFIC = -1;
 static gint ett_HI2Operations_UserSignalType = -1;
 static gint ett_HI2Operations_LocationType = -1;
 static gint ett_HI2Operations_CdcPdu = -1;
@@ -483,13 +465,6 @@ static gint ett_HI2Operations_T_sepCCCpair = -1;
 static gint ett_HI2Operations_PartyId = -1;
 static gint ett_HI2Operations_RedirectedFromInfo = -1;
 static gint ett_HI2Operations_TerminalDisplayInfo = -1;
-static gint ett_HI2Operations_LIACTIVATEreq = -1;
-static gint ett_HI2Operations_SEQUENCE_OF_ActivityType = -1;
-static gint ett_HI2Operations_LIACTIVATEconf = -1;
-static gint ett_HI2Operations_LIMODIFYreq = -1;
-static gint ett_HI2Operations_T_modificationType = -1;
-static gint ett_HI2Operations_LIMODIFYconf = -1;
-static gint ett_HI2Operations_LISTATUSind = -1;
 static gint ett_HI2Operations_TARGETACTIVITYMONITORind = -1;
 static gint ett_HI2Operations_SEQUENCE_OF_AddressType = -1;
 static gint ett_HI2Operations_SEQUENCE_OF_LocationType_en301040 = -1;
@@ -3785,212 +3760,6 @@ dissect_HI2Operations_IRIsContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
   return offset;
 }
 
-
-static const ber_sequence_t TTRAFFIC_sequence[] = {
-  { &hf_HI2Operations_version, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_lIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LIIDType },
-  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { &hf_HI2Operations_cryptoChecksum, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_TTRAFFIC(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   TTRAFFIC_sequence, hf_index, ett_HI2Operations_TTRAFFIC);
-
-  return offset;
-}
-
-
-static const ber_sequence_t CTTRAFFIC_sequence[] = {
-  { &hf_HI2Operations_version, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_lIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_LIIDType },
-  { &hf_HI2Operations_correspondentCount, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_iRITransactionNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_trafficPacket, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { &hf_HI2Operations_cryptoChecksum, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BIT_STRING },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_CTTRAFFIC(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   CTTRAFFIC_sequence, hf_index, ett_HI2Operations_CTTRAFFIC);
-
-  return offset;
-}
-
-
-
-static int
-dissect_HI2Operations_VisibleString(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_VisibleString,
-                                            actx, tree, tvb, offset, hf_index,
-                                            NULL);
-
-  return offset;
-}
-
-
-static const ber_sequence_t SEQUENCE_OF_ActivityType_sequence_of[1] = {
-  { &hf_HI2Operations_monitorServiceList_item, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_ActivityType },
-};
-
-static int
-dissect_HI2Operations_SEQUENCE_OF_ActivityType(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_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      SEQUENCE_OF_ActivityType_sequence_of, hf_index, ett_HI2Operations_SEQUENCE_OF_ActivityType);
-
-  return offset;
-}
-
-
-static const ber_sequence_t LIACTIVATEreq_sequence[] = {
-  { &hf_HI2Operations_timeStamp_01, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_invokeId, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_targetAddress, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_AddressType },
-  { &hf_HI2Operations_expiryDateTime, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_targetname, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_VisibleString },
-  { &hf_HI2Operations_additionaltargetdata, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_VisibleString },
-  { &hf_HI2Operations_monitorServiceList, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_ActivityType },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_LIACTIVATEreq(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LIACTIVATEreq_sequence, hf_index, ett_HI2Operations_LIACTIVATEreq);
-
-  return offset;
-}
-
-
-
-static int
-dissect_HI2Operations_BOOLEAN(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 LIACTIVATEconf_sequence[] = {
-  { &hf_HI2Operations_timeStamp_01, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_invokeId, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_result, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BOOLEAN },
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_LIACTIVATEconf(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LIACTIVATEconf_sequence, hf_index, ett_HI2Operations_LIACTIVATEconf);
-
-  return offset;
-}
-
-
-static const value_string HI2Operations_T_modificationType_vals[] = {
-  {   0, "halt" },
-  {   1, "reset" },
-  {   2, "expiryDateTime" },
-  {   3, "targetname" },
-  {   4, "additionaltargetdata" },
-  {   5, "monitorServiceList" },
-  { 0, NULL }
-};
-
-static const ber_choice_t T_modificationType_choice[] = {
-  {   0, &hf_HI2Operations_halt  , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BOOLEAN },
-  {   1, &hf_HI2Operations_reset , BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BOOLEAN },
-  {   2, &hf_HI2Operations_expiryDateTime, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  {   3, &hf_HI2Operations_targetname, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_VisibleString },
-  {   4, &hf_HI2Operations_additionaltargetdata, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_VisibleString },
-  {   5, &hf_HI2Operations_monitorServiceList, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_SEQUENCE_OF_ActivityType },
-  { 0, NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_T_modificationType(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,
-                                 T_modificationType_choice, hf_index, ett_HI2Operations_T_modificationType,
-                                 NULL);
-
-  return offset;
-}
-
-
-static const ber_sequence_t LIMODIFYreq_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_modificationNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_modificationType, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_HI2Operations_T_modificationType },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_LIMODIFYreq(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LIMODIFYreq_sequence, hf_index, ett_HI2Operations_LIMODIFYreq);
-
-  return offset;
-}
-
-
-static const ber_sequence_t LIMODIFYconf_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_modificationNumber, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_INTEGER },
-  { &hf_HI2Operations_result, BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_BOOLEAN },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_LIMODIFYconf(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LIMODIFYconf_sequence, hf_index, ett_HI2Operations_LIMODIFYconf);
-
-  return offset;
-}
-
-
-static const value_string HI2Operations_StatusType_vals[] = {
-  {   0, "networkFullyAvailable" },
-  {   1, "networkErrorsAffectingIntercept" },
-  {   2, "reconfigurationInProgress" },
-  {   3, "sessionExpired" },
-  {   4, "gatewayServicesUnavailable" },
-  { 0, NULL }
-};
-
-
-static int
-dissect_HI2Operations_StatusType(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 const ber_sequence_t LISTATUSind_sequence[] = {
-  { &hf_HI2Operations_tLIInstanceid, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_TLIIdType },
-  { &hf_HI2Operations_timestamp, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_UTCTime },
-  { &hf_HI2Operations_tETRASysStatus, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_HI2Operations_StatusType },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_HI2Operations_LISTATUSind(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_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   LISTATUSind_sequence, hf_index, ett_HI2Operations_LISTATUSind);
-
-  return offset;
-}
-
 /*--- PDUs ---*/
 
 static void dissect_IRIsContent_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@@ -4752,18 +4521,6 @@ void proto_register_HI2Operations(void) {
       { "cryptoCheckSum", "HI2Operations.cryptoCheckSum",
         FT_BYTES, BASE_NONE, NULL, 0,
         "HI2Operations.BIT_STRING", HFILL }},
-    { &hf_HI2Operations_trafficPacket,
-      { "trafficPacket", "HI2Operations.trafficPacket",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "HI2Operations.BIT_STRING", HFILL }},
-    { &hf_HI2Operations_cryptoChecksum,
-      { "cryptoChecksum", "HI2Operations.cryptoChecksum",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "HI2Operations.BIT_STRING", HFILL }},
-    { &hf_HI2Operations_correspondentCount,
-      { "correspondentCount", "HI2Operations.correspondentCount",
-        FT_INT32, BASE_DEC, NULL, 0,
-        "HI2Operations.INTEGER", HFILL }},
     { &hf_HI2Operations_copySignal,
       { "copySignal", "HI2Operations.copySignal",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -5140,66 +4897,10 @@ void proto_register_HI2Operations(void) {
       { "messageWaitingNotif", "HI2Operations.messageWaitingNotif",
         FT_STRING, BASE_NONE, NULL, 0,
         "HI2Operations.VisibleString_SIZE_1_40_", HFILL }},
-    { &hf_HI2Operations_timeStamp_01,
-      { "timeStamp", "HI2Operations.timeStamp",
-        FT_STRING, BASE_NONE, NULL, 0,
-        "HI2Operations.UTCTime", HFILL }},
-    { &hf_HI2Operations_invokeId,
-      { "invokeId", "HI2Operations.invokeId",
-        FT_INT32, BASE_DEC, NULL, 0,
-        "HI2Operations.INTEGER", HFILL }},
-    { &hf_HI2Operations_targetAddress,
-      { "targetAddress", "HI2Operations.targetAddress",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "HI2Operations.AddressType", HFILL }},
-    { &hf_HI2Operations_expiryDateTime,
-      { "expiryDateTime", "HI2Operations.expiryDateTime",
-        FT_STRING, BASE_NONE, NULL, 0,
-        "HI2Operations.UTCTime", HFILL }},
-    { &hf_HI2Operations_targetname,
-      { "targetname", "HI2Operations.targetname",
-        FT_STRING, BASE_NONE, NULL, 0,
-        "HI2Operations.VisibleString", HFILL }},
-    { &hf_HI2Operations_additionaltargetdata,
-      { "additionaltargetdata", "HI2Operations.additionaltargetdata",
-        FT_STRING, BASE_NONE, NULL, 0,
-        "HI2Operations.VisibleString", HFILL }},
-    { &hf_HI2Operations_monitorServiceList,
-      { "monitorServiceList", "HI2Operations.monitorServiceList",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "HI2Operations.SEQUENCE_OF_ActivityType", HFILL }},
-    { &hf_HI2Operations_monitorServiceList_item,
-      { "ActivityType", "HI2Operations.ActivityType",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "HI2Operations.ActivityType", HFILL }},
-    { &hf_HI2Operations_result,
-      { "result", "HI2Operations.result",
-        FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "HI2Operations.BOOLEAN", HFILL }},
     { &hf_HI2Operations_tLIInstanceid,
       { "tLIInstanceid", "HI2Operations.tLIInstanceid",
         FT_BYTES, BASE_NONE, NULL, 0,
         "HI2Operations.TLIIdType", HFILL }},
-    { &hf_HI2Operations_modificationNumber,
-      { "modificationNumber", "HI2Operations.modificationNumber",
-        FT_INT32, BASE_DEC, NULL, 0,
-        "HI2Operations.INTEGER", HFILL }},
-    { &hf_HI2Operations_modificationType,
-      { "modificationType", "HI2Operations.modificationType",
-        FT_UINT32, BASE_DEC, VALS(HI2Operations_T_modificationType_vals), 0,
-        "HI2Operations.T_modificationType", HFILL }},
-    { &hf_HI2Operations_halt,
-      { "halt", "HI2Operations.halt",
-        FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "HI2Operations.BOOLEAN", HFILL }},
-    { &hf_HI2Operations_reset,
-      { "reset", "HI2Operations.reset",
-        FT_BOOLEAN, BASE_NONE, NULL, 0,
-        "HI2Operations.BOOLEAN", HFILL }},
-    { &hf_HI2Operations_tETRASysStatus,
-      { "tETRASysStatus", "HI2Operations.tETRASysStatus",
-        FT_UINT32, BASE_DEC, VALS(HI2Operations_StatusType_vals), 0,
-        "HI2Operations.StatusType", HFILL }},
     { &hf_HI2Operations_targetLocation_01,
       { "targetLocation", "HI2Operations.targetLocation",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_LocationType_en301040_vals), 0,
@@ -5244,6 +4945,10 @@ void proto_register_HI2Operations(void) {
       { "CircuitIdType", "HI2Operations.CircuitIdType",
         FT_STRING, BASE_NONE, NULL, 0,
         "HI2Operations.CircuitIdType", HFILL }},
+    { &hf_HI2Operations_trafficPacket,
+      { "trafficPacket", "HI2Operations.trafficPacket",
+        FT_BYTES, BASE_NONE, NULL, 0,
+        "HI2Operations.BIT_STRING", HFILL }},
     { &hf_HI2Operations_cctivity,
       { "cctivity", "HI2Operations.cctivity",
         FT_UINT32, BASE_DEC, VALS(HI2Operations_ActivityClassType_vals), 0,
@@ -5404,8 +5109,6 @@ void proto_register_HI2Operations(void) {
     &ett_HI2Operations_IRI_to_CC_Correlation,
     &ett_HI2Operations_T_cc,
     &ett_HI2Operations_TARGETACTIVITYMONITOR_1,
-    &ett_HI2Operations_TTRAFFIC,
-    &ett_HI2Operations_CTTRAFFIC,
     &ett_HI2Operations_UserSignalType,
     &ett_HI2Operations_LocationType,
     &ett_HI2Operations_CdcPdu,
@@ -5432,13 +5135,6 @@ void proto_register_HI2Operations(void) {
     &ett_HI2Operations_PartyId,
     &ett_HI2Operations_RedirectedFromInfo,
     &ett_HI2Operations_TerminalDisplayInfo,
-    &ett_HI2Operations_LIACTIVATEreq,
-    &ett_HI2Operations_SEQUENCE_OF_ActivityType,
-    &ett_HI2Operations_LIACTIVATEconf,
-    &ett_HI2Operations_LIMODIFYreq,
-    &ett_HI2Operations_T_modificationType,
-    &ett_HI2Operations_LIMODIFYconf,
-    &ett_HI2Operations_LISTATUSind,
     &ett_HI2Operations_TARGETACTIVITYMONITORind,
     &ett_HI2Operations_SEQUENCE_OF_AddressType,
     &ett_HI2Operations_SEQUENCE_OF_LocationType_en301040,
index bd8078a4aea5d24f22b4c77ef44063df8ebdf88b..f3289a8af0a3156ce22c0e1f377b0debe9f467be 100644 (file)
@@ -867,7 +867,7 @@ dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 
 static const ber_sequence_t T_manageDSAITPlaneRef_sequence[] = {
   { &hf_dap_dsaName         , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_dap_Name },
-  { &hf_dap_agreementID     , -1/*imported*/, -1/*imported*/, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
+  { &hf_dap_agreementID     , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_disp_AgreementID },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -2134,7 +2134,7 @@ dissect_dap_ServiceProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
-static const value_string dap_SecurityProblem_vals[] = {
+const value_string dap_SecurityProblem_vals[] = {
   {   1, "inappropriateAuthentication" },
   {   2, "invalidCredentials" },
   {   3, "insufficientAccessRights" },
@@ -2148,7 +2148,7 @@ static const value_string dap_SecurityProblem_vals[] = {
 };
 
 
-static int
+int
 dissect_dap_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   guint32 problem;
 
index ca7438fa66bfd95a470be5aeec1ad3454ed5597b..dbc1e105e7d188b36a1fd9551f2efc4c804cb215 100644 (file)
@@ -65,6 +65,7 @@ extern const value_string dap_AttributeError_vals[];
 extern const value_string dap_NameError_vals[];
 extern const value_string dap_Referral_vals[];
 extern const value_string dap_SecurityError_vals[];
+extern const value_string dap_SecurityProblem_vals[];
 extern const value_string dap_ServiceError_vals[];
 extern const value_string dap_UpdateError_vals[];
 int dissect_dap_FamilyGrouping(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
@@ -102,6 +103,7 @@ int dissect_dap_AttributeError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 int dissect_dap_NameError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dap_Referral(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dap_SecurityError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
+int dissect_dap_SecurityProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dap_ServiceError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dap_UpdateError(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 
index 57dcf0a7e15193690e3adb7428ed81bb8b2017b3..ca1f6aef276438453388ed94db324f6789a5c335 100644 (file)
@@ -757,7 +757,7 @@ static const ber_sequence_t AccessPointInformation_set[] = {
   { NULL, 0, 0, 0, NULL }
 };
 
-static int
+int
 dissect_dsp_AccessPointInformation(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_set(implicit_tag, actx, tree, tvb, offset,
                               AccessPointInformation_set, hf_index, ett_dsp_AccessPointInformation);
index df7a8e6a92909fdbc452a61dbc77d09ae232718b..0c1a97dce4de14c984b5f094d6b39132a4c7c69d 100644 (file)
@@ -42,6 +42,7 @@ int dissect_dsp_OperationProgress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 int dissect_dsp_ReferenceType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dsp_AccessPoint(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dsp_MasterAndShadowAccessPoints(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
+int dissect_dsp_AccessPointInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dsp_Exclusions(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 int dissect_dsp_ContinuationReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 
index 73ec7be2650f19b22e2aaa22f4cd60f3927fd4bd..95a26429d49deedc8c49a79eef9b9f83e23d87a1 100644 (file)
@@ -593,4 +593,10 @@ proto_register_gsm_a_rp(void)
 void
 proto_reg_handoff_gsm_a_rp(void)
 {
+    dissector_handle_t gsm_a_rp_handle;
+
+       gsm_a_rp_handle = create_dissector_handle(dissect_rp, proto_a_rp);
+       /* Dissect messages embedded in SIP */
+       dissector_add_string("media_type","application/vnd.3gpp.sms", gsm_a_rp_handle);
+
 }
index 1d22d3bc1e5f3d543fe850fd9bb900c82580d026..ee2ee4c5429df01241468e37439151c1dd5c721c 100644 (file)
@@ -91,7 +91,11 @@ typedef enum _ProtocolIE_ID_enum {
   id_RNC_ID    =  14,
   id_CSG_ID    =  15,
   id_BackoffTimer =  16,
-  id_HNB_Internet_Information =  17
+  id_HNB_Internet_Information =  17,
+  id_HNB_Cell_Access_Mode =  18,
+  id_MuxPortNumber =  19,
+  id_Service_Area_For_Broadcast =  20,
+  id_CSGMembershipStatus =  21
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-hnbap-val.h ---*/
@@ -109,10 +113,13 @@ static int hf_hnbap_CellIdentity_PDU = -1;        /* CellIdentity */
 static int hf_hnbap_Context_ID_PDU = -1;          /* Context_ID */
 static int hf_hnbap_CriticalityDiagnostics_PDU = -1;  /* CriticalityDiagnostics */
 static int hf_hnbap_CSG_ID_PDU = -1;              /* CSG_ID */
+static int hf_hnbap_CSGMembershipStatus_PDU = -1;  /* CSGMembershipStatus */
+static int hf_hnbap_HNB_Cell_Access_Mode_PDU = -1;  /* HNB_Cell_Access_Mode */
 static int hf_hnbap_HNB_Location_Information_PDU = -1;  /* HNB_Location_Information */
 static int hf_hnbap_HNB_Identity_PDU = -1;        /* HNB_Identity */
 static int hf_hnbap_IP_Address_PDU = -1;          /* IP_Address */
 static int hf_hnbap_LAC_PDU = -1;                 /* LAC */
+static int hf_hnbap_MuxPortNumber_PDU = -1;       /* MuxPortNumber */
 static int hf_hnbap_PLMNidentity_PDU = -1;        /* PLMNidentity */
 static int hf_hnbap_RAC_PDU = -1;                 /* RAC */
 static int hf_hnbap_Registration_Cause_PDU = -1;  /* Registration_Cause */
@@ -353,7 +360,7 @@ dissect_hnbap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 255U, &ProcedureCode, FALSE);
 
-#line 57 "hnbap.cnf"
+#line 59 "hnbap.cnf"
      col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
                  val_to_str(ProcedureCode, hnbap_ProcedureCode_vals,
                             "unknown message"));
@@ -380,6 +387,10 @@ static const value_string hnbap_ProtocolIE_ID_vals[] = {
   { id_CSG_ID, "id-CSG-ID" },
   { id_BackoffTimer, "id-BackoffTimer" },
   { id_HNB_Internet_Information, "id-HNB-Internet-Information" },
+  { id_HNB_Cell_Access_Mode, "id-HNB-Cell-Access-Mode" },
+  { id_MuxPortNumber, "id-MuxPortNumber" },
+  { id_Service_Area_For_Broadcast, "id-Service-Area-For-Broadcast" },
+  { id_CSGMembershipStatus, "id-CSGMembershipStatus" },
   { 0, NULL }
 };
 
@@ -389,7 +400,7 @@ dissect_hnbap_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, maxProtocolIEs, &ProtocolIE_ID, FALSE);
 
-#line 46 "hnbap.cnf"
+#line 48 "hnbap.cnf"
   if (tree) {
     proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(hnbap_ProtocolIE_ID_vals), "unknown (%d)"));
   }
@@ -455,15 +466,6 @@ dissect_hnbap_ProtocolIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 
 
-static int
-dissect_hnbap_ProtocolIE_Single_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_hnbap_ProtocolIE_Field(tvb, offset, actx, tree, hf_index);
-
-  return offset;
-}
-
-
-
 static int
 dissect_hnbap_T_extensionValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_ProtocolExtensionFieldExtensionValue);
@@ -832,6 +834,22 @@ dissect_hnbap_CSG_Indicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx
 }
 
 
+static const value_string hnbap_CSGMembershipStatus_vals[] = {
+  {   0, "member" },
+  {   1, "non-member" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_hnbap_CSGMembershipStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     2, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 
 static int
 dissect_hnbap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -879,22 +897,6 @@ dissect_hnbap_CGI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
 }
 
 
-static const value_string hnbap_CN_DomainIndicator_vals[] = {
-  {   0, "cs-domain" },
-  {   1, "ps-domain" },
-  { 0, NULL }
-};
-
-
-static int
-dissect_hnbap_CN_DomainIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
-                                     2, NULL, FALSE, 0, NULL);
-
-  return offset;
-}
-
-
 
 static int
 dissect_hnbap_ESN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -974,6 +976,23 @@ dissect_hnbap_GeographicalLocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 }
 
 
+static const value_string hnbap_HNB_Cell_Access_Mode_vals[] = {
+  {   0, "closed" },
+  {   1, "hybrid" },
+  {   2, "open" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_hnbap_HNB_Cell_Access_Mode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     3, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 
 static int
 dissect_hnbap_RAC(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -1198,6 +1217,16 @@ dissect_hnbap_LAI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto
 
 
 
+static int
+dissect_hnbap_MuxPortNumber(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            1024U, 65535U, NULL, FALSE);
+
+  return offset;
+}
+
+
+
 static int
 dissect_hnbap_PTMSI(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@@ -1655,6 +1684,22 @@ static int dissect_CSG_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_t
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_CSGMembershipStatus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_hnbap_CSGMembershipStatus(tvb, offset, &asn1_ctx, tree, hf_hnbap_CSGMembershipStatus_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
+static int dissect_HNB_Cell_Access_Mode_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_hnbap_HNB_Cell_Access_Mode(tvb, offset, &asn1_ctx, tree, hf_hnbap_HNB_Cell_Access_Mode_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_HNB_Location_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -1687,6 +1732,14 @@ static int dissect_LAC_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_MuxPortNumber_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_hnbap_MuxPortNumber(tvb, offset, &asn1_ctx, tree, hf_hnbap_MuxPortNumber_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_PLMNidentity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -1927,6 +1980,14 @@ void proto_register_hnbap(void) {
       { "CSG-ID", "hnbap.CSG_ID",
         FT_BYTES, BASE_NONE, NULL, 0,
         "hnbap.CSG_ID", HFILL }},
+    { &hf_hnbap_CSGMembershipStatus_PDU,
+      { "CSGMembershipStatus", "hnbap.CSGMembershipStatus",
+        FT_UINT32, BASE_DEC, VALS(hnbap_CSGMembershipStatus_vals), 0,
+        "hnbap.CSGMembershipStatus", HFILL }},
+    { &hf_hnbap_HNB_Cell_Access_Mode_PDU,
+      { "HNB-Cell-Access-Mode", "hnbap.HNB_Cell_Access_Mode",
+        FT_UINT32, BASE_DEC, VALS(hnbap_HNB_Cell_Access_Mode_vals), 0,
+        "hnbap.HNB_Cell_Access_Mode", HFILL }},
     { &hf_hnbap_HNB_Location_Information_PDU,
       { "HNB-Location-Information", "hnbap.HNB_Location_Information",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -1943,6 +2004,10 @@ void proto_register_hnbap(void) {
       { "LAC", "hnbap.LAC",
         FT_BYTES, BASE_NONE, NULL, 0,
         "hnbap.LAC", HFILL }},
+    { &hf_hnbap_MuxPortNumber_PDU,
+      { "MuxPortNumber", "hnbap.MuxPortNumber",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        "hnbap.MuxPortNumber", HFILL }},
     { &hf_hnbap_PLMNidentity_PDU,
       { "PLMNidentity", "hnbap.PLMNidentity",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -2404,6 +2469,10 @@ proto_reg_handoff_hnbap(void)
   dissector_add("hnbap.ies", id_CSG_ID, new_create_dissector_handle(dissect_CSG_ID_PDU, proto_hnbap));
   dissector_add("hnbap.ies", id_BackoffTimer, new_create_dissector_handle(dissect_BackoffTimer_PDU, proto_hnbap));
   dissector_add("hnbap.extension", id_HNB_Internet_Information, new_create_dissector_handle(dissect_IP_Address_PDU, proto_hnbap));
+  dissector_add("hnbap.extension", id_HNB_Cell_Access_Mode, new_create_dissector_handle(dissect_HNB_Cell_Access_Mode_PDU, proto_hnbap));
+  dissector_add("hnbap.extension", id_MuxPortNumber, new_create_dissector_handle(dissect_MuxPortNumber_PDU, proto_hnbap));
+  dissector_add("hnbap.extension", id_Service_Area_For_Broadcast, new_create_dissector_handle(dissect_SAC_PDU, proto_hnbap));
+  dissector_add("hnbap.extension", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_hnbap));
   dissector_add("hnbap.proc.imsg", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterRequest_PDU, proto_hnbap));
   dissector_add("hnbap.proc.sout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterAccept_PDU, proto_hnbap));
   dissector_add("hnbap.proc.uout", id_HNBRegister, new_create_dissector_handle(dissect_HNBRegisterReject_PDU, proto_hnbap));
index e44734a3ceeb11a95d81505a8a3a6eb19c79bf61..40c09095f02ef6041bd1eb18c89bf62a1636e654 100644 (file)
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-inap.c                                                              */
-/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
+/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn IN-errorcodes.asn IN-errortypes.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
 
 /* Input file: packet-inap-template.c */
 
@@ -53,6 +53,8 @@
 #include "packet-e164.h"
 #include "packet-isup.h"
 #include "packet-tcap.h"
+#include "packet-dap.h"
+#include "packet-dsp.h"
 
 #define PNAME  "Intelligent Network Application Protocol"
 #define PSNAME "INAP"
@@ -438,10 +440,29 @@ static int proto_inap = -1;
 #define initialCallSegment             1
 #define leg1                           0x01
 #define leg2                           0x02
+#define errcode_canceled               0
+#define errcode_cancelFailed           1
+#define errcode_eTCFailed              3
+#define errcode_improperCallerResponse 4
+#define errcode_missingCustomerRecord  6
+#define errcode_missingParameter       7
+#define errcode_parameterOutOfRange    8
+#define errcode_requestedInfoError     10
+#define errcode_systemFailure          11
+#define errcode_taskRefused            12
+#define errcode_unavailableResource    13
+#define errcode_unexpectedComponentSequence 14
+#define errcode_unexpectedDataValue    15
+#define errcode_unexpectedParameter    16
+#define errcode_unknownLegID           17
+#define errcode_unknownResource        18
+#define errcode_scfReferral            21
+#define errcode_scfTaskRefused         22
+#define errcode_chainingRefused        23
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-inap-val.h ---*/
-#line 58 "packet-inap-template.c"
+#line 60 "packet-inap-template.c"
 
 
 /*--- Included file: packet-inap-hf.c ---*/
@@ -536,6 +557,12 @@ static int hf_inap_ScriptInformationArg_PDU = -1;  /* ScriptInformationArg */
 static int hf_inap_ScriptRunArg_PDU = -1;         /* ScriptRunArg */
 static int hf_inap_SpecializedResourceReportArg_PDU = -1;  /* SpecializedResourceReportArg */
 static int hf_inap_SRFCallGapArg_PDU = -1;        /* SRFCallGapArg */
+static int hf_inap_PAR_cancelFailed_PDU = -1;     /* PAR_cancelFailed */
+static int hf_inap_PAR_requestedInfoError_PDU = -1;  /* PAR_requestedInfoError */
+static int hf_inap_ScfTaskRefusedParameter_PDU = -1;  /* ScfTaskRefusedParameter */
+static int hf_inap_ReferralParameter_PDU = -1;    /* ReferralParameter */
+static int hf_inap_UnavailableNetworkResource_PDU = -1;  /* UnavailableNetworkResource */
+static int hf_inap_PAR_taskRefused_PDU = -1;      /* PAR_taskRefused */
 static int hf_inap_Extensions_item = -1;          /* ExtensionField */
 static int hf_inap_type = -1;                     /* Code */
 static int hf_inap_criticality = -1;              /* CriticalityType */
@@ -972,6 +999,11 @@ static int hf_inap_uIScriptResult = -1;           /* T_uIScriptResult */
 static int hf_inap_uIScriptSpecificInfo_01 = -1;  /* T_uIScriptSpecificInfo_01 */
 static int hf_inap_uIScriptSpecificInfo_02 = -1;  /* T_uIScriptSpecificInfo_02 */
 static int hf_inap_sRFgapCriteria = -1;           /* SRFGapCriteria */
+static int hf_inap_problem = -1;                  /* T_problem */
+static int hf_inap_operation = -1;                /* InvokeID */
+static int hf_inap_reason_01 = -1;                /* T_reason */
+static int hf_inap_securityParameters = -1;       /* SecurityParameters */
+static int hf_inap_tryhere = -1;                  /* AccessPointInformation */
 static int hf_inap_local_01 = -1;                 /* T_local */
 static int hf_inap_invoke = -1;                   /* Invoke */
 static int hf_inap_returnResult = -1;             /* ReturnResult */
@@ -987,7 +1019,7 @@ static int hf_inap_result = -1;                   /* T_result */
 static int hf_inap_resultArgument = -1;           /* ResultArgument */
 static int hf_inap_errcode = -1;                  /* Code */
 static int hf_inap_parameter = -1;                /* T_parameter */
-static int hf_inap_problem = -1;                  /* T_problem */
+static int hf_inap_problem_01 = -1;               /* T_problem_01 */
 static int hf_inap_general = -1;                  /* GeneralProblem */
 static int hf_inap_invokeProblem = -1;            /* InvokeProblem */
 static int hf_inap_problemReturnResult = -1;      /* ReturnResultProblem */
@@ -996,7 +1028,7 @@ static int hf_inap_present = -1;                  /* INTEGER */
 static int hf_inap_InvokeId_present = -1;         /* InvokeId_present */
 
 /*--- End of included file: packet-inap-hf.c ---*/
-#line 60 "packet-inap-template.c"
+#line 62 "packet-inap-template.c"
 
 #define MAX_SSN 254
 static range_t *global_ssn_range;
@@ -1243,6 +1275,9 @@ static gint ett_inap_ScriptEventArg = -1;
 static gint ett_inap_ScriptInformationArg = -1;
 static gint ett_inap_ScriptRunArg = -1;
 static gint ett_inap_SRFCallGapArg = -1;
+static gint ett_inap_PAR_cancelFailed = -1;
+static gint ett_inap_ScfTaskRefusedParameter = -1;
+static gint ett_inap_ReferralParameter = -1;
 static gint ett_inap_Code = -1;
 static gint ett_inap_ROS = -1;
 static gint ett_inap_Invoke = -1;
@@ -1251,11 +1286,11 @@ static gint ett_inap_ReturnResult = -1;
 static gint ett_inap_T_result = -1;
 static gint ett_inap_ReturnError = -1;
 static gint ett_inap_Reject = -1;
-static gint ett_inap_T_problem = -1;
+static gint ett_inap_T_problem_01 = -1;
 static gint ett_inap_InvokeId = -1;
 
 /*--- End of included file: packet-inap-ett.c ---*/
-#line 81 "packet-inap-template.c"
+#line 83 "packet-inap-template.c"
 
 
 /*--- Included file: packet-inap-table.c ---*/
@@ -1357,13 +1392,31 @@ const value_string inap_opr_code_strings[] = {
 
 /* INAP ERRORS */
 static const value_string inap_err_code_string_vals[] = {
-/* Unknown or empty loop list ERROR.&errorCode */
+       { errcode_canceled                        , "canceled" },  
+       { errcode_cancelFailed                    , "cancelFailed" },  
+       { errcode_chainingRefused                 , "chainingRefused" },  
+       { errcode_eTCFailed                       , "eTCFailed" },  
+       { errcode_improperCallerResponse          , "improperCallerResponse" },  
+       { errcode_missingCustomerRecord           , "missingCustomerRecord" },  
+       { errcode_missingParameter                , "missingParameter" },  
+       { errcode_parameterOutOfRange             , "parameterOutOfRange" },  
+       { errcode_requestedInfoError              , "requestedInfoError" },  
+       { errcode_scfTaskRefused                  , "scfTaskRefused" },  
+       { errcode_scfReferral                     , "scfReferral" },  
+       { errcode_systemFailure                   , "systemFailure" },  
+       { errcode_taskRefused                     , "taskRefused" },  
+       { errcode_unavailableResource             , "unavailableResource" },  
+       { errcode_unexpectedComponentSequence     , "unexpectedComponentSequence" },  
+       { errcode_unexpectedDataValue             , "unexpectedDataValue" },  
+       { errcode_unexpectedParameter             , "unexpectedParameter" },  
+       { errcode_unknownLegID                    , "unknownLegID" },  
+       { errcode_unknownResource                 , "unknownResource" },  
   { 0, NULL }
 };
 
 
 /*--- End of included file: packet-inap-table.c ---*/
-#line 83 "packet-inap-template.c"
+#line 85 "packet-inap-template.c"
 
 const value_string inap_general_problem_strings[] = {
 {0,"General Problem Unrecognized Component"},
@@ -1400,7 +1453,7 @@ dissect_inap_CriticalityType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 static int
 dissect_inap_T_local(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 165 "inap.cnf"
+#line 163 "inap.cnf"
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
                                                 &opcode);
 
@@ -1457,7 +1510,7 @@ dissect_inap_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 static int
 dissect_inap_T_value(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 "inap.cnf"
+#line 217 "inap.cnf"
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        NULL);
 
@@ -2128,7 +2181,7 @@ dissect_inap_BCSMEvent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_inap_T_bearerCap(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 "inap.cnf"
+#line 244 "inap.cnf"
 
  tvbuff_t      *parameter_tvb;
 
@@ -2283,7 +2336,7 @@ dissect_inap_CalledPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tvb
 
 static int
 dissect_inap_CalledPartyNumber(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 225 "inap.cnf"
+#line 223 "inap.cnf"
   tvbuff_t *parameter_tvb;
 
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -2334,7 +2387,7 @@ dissect_inap_CallingPartyBusinessGroupID(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_inap_CallingPartyNumber(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 235 "inap.cnf"
+#line 233 "inap.cnf"
   tvbuff_t *parameter_tvb;
 
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -4463,7 +4516,7 @@ dissect_inap_GlobalCallReference(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, i
 
 int
 dissect_inap_HighLayerCompatibility(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 288 "inap.cnf"
+#line 286 "inap.cnf"
 /*
  * -- Indicates the teleservice. For encoding, DSS1 (Q.931) is used.
  */
@@ -4637,7 +4690,7 @@ dissect_inap_NumberingPlan(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 static int
 dissect_inap_OriginalCalledPartyID(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 268 "inap.cnf"
+#line 266 "inap.cnf"
 
  tvbuff_t      *parameter_tvb;
 
@@ -4700,7 +4753,7 @@ dissect_inap_Reason(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 
 static int
 dissect_inap_RedirectingPartyID(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 278 "inap.cnf"
+#line 276 "inap.cnf"
 
  tvbuff_t      *parameter_tvb;
 
@@ -4721,7 +4774,7 @@ dissect_inap_RedirectingPartyID(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 int
 dissect_inap_RedirectionInformation(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 257 "inap.cnf"
+#line 255 "inap.cnf"
 
  tvbuff_t      *parameter_tvb;
 
@@ -5085,7 +5138,7 @@ dissect_inap_T_triggerId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_inap_T_triggerPar(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 204 "inap.cnf"
+#line 202 "inap.cnf"
 /* FIX ME */
 
 
@@ -7663,7 +7716,7 @@ dissect_inap_MessageReceivedArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_inap_T_uIScriptSpecificInfo(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 210 "inap.cnf"
+#line 208 "inap.cnf"
 /* FIX ME */
 
 
@@ -7692,7 +7745,7 @@ dissect_inap_ScriptCloseArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_inap_T_uIScriptResult(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 "inap.cnf"
+#line 205 "inap.cnf"
 /* FIX ME */
 
 
@@ -7722,7 +7775,7 @@ dissect_inap_ScriptEventArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_inap_T_uIScriptSpecificInfo_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 213 "inap.cnf"
+#line 211 "inap.cnf"
 /* FIX ME */
 
 
@@ -7750,7 +7803,7 @@ dissect_inap_ScriptInformationArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 static int
 dissect_inap_T_uIScriptSpecificInfo_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 215 "inap.cnf"
+#line 213 "inap.cnf"
 /* FIX ME */
 
 
@@ -7804,6 +7857,118 @@ dissect_inap_SRFCallGapArg(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 }
 
 
+static const value_string inap_T_problem_vals[] = {
+  {   0, "unknownOperation" },
+  {   1, "tooLate" },
+  {   2, "operationNotCancellable" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_inap_T_problem(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 const ber_sequence_t PAR_cancelFailed_sequence[] = {
+  { &hf_inap_problem        , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_T_problem },
+  { &hf_inap_operation      , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_InvokeID },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_inap_PAR_cancelFailed(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_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   PAR_cancelFailed_sequence, hf_index, ett_inap_PAR_cancelFailed);
+
+  return offset;
+}
+
+
+static const value_string inap_PAR_requestedInfoError_vals[] = {
+  {   1, "unknownRequestedInfo" },
+  {   2, "requestedInfoNotAvailable" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_inap_PAR_requestedInfoError(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 const value_string inap_T_reason_vals[] = {
+  {   0, "generic" },
+  {   1, "unobtainable" },
+  {   2, "congestion" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_inap_T_reason(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 const ber_sequence_t ScfTaskRefusedParameter_sequence[] = {
+  { &hf_inap_reason_01      , BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_inap_T_reason },
+  { &hf_inap_securityParameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dap_SecurityParameters },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_inap_ScfTaskRefusedParameter(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_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   ScfTaskRefusedParameter_sequence, hf_index, ett_inap_ScfTaskRefusedParameter);
+
+  return offset;
+}
+
+
+static const ber_sequence_t ReferralParameter_sequence[] = {
+  { &hf_inap_tryhere        , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_dsp_AccessPointInformation },
+  { &hf_inap_securityParameters, BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_dap_SecurityParameters },
+  { NULL, 0, 0, 0, NULL }
+};
+
+static int
+dissect_inap_ReferralParameter(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_sequence(implicit_tag, actx, tree, tvb, offset,
+                                   ReferralParameter_sequence, hf_index, ett_inap_ReferralParameter);
+
+  return offset;
+}
+
+
+static const value_string inap_PAR_taskRefused_vals[] = {
+  {   0, "generic" },
+  {   1, "unobtainable" },
+  {   2, "congestion" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_inap_PAR_taskRefused(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 const value_string inap_InvokeId_vals[] = {
   {   0, "present" },
   {   1, "absent" },
@@ -7870,7 +8035,7 @@ dissect_inap_T_linkedId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static int
 dissect_inap_T_argument(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 192 "inap.cnf"
+#line 190 "inap.cnf"
        offset = dissect_invokeData(tree, tvb, offset, actx);
 
 
@@ -7889,7 +8054,7 @@ static const ber_sequence_t Invoke_sequence[] = {
 
 static int
 dissect_inap_Invoke(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 180 "inap.cnf"
+#line 178 "inap.cnf"
   inap_opcode_type=INAP_OPCODE_INVOKE;
 
 
@@ -7903,7 +8068,7 @@ dissect_inap_Invoke(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_
 
 static int
 dissect_inap_ResultArgument(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 "inap.cnf"
+#line 193 "inap.cnf"
        offset = dissect_returnResultData(tree, tvb, offset, actx);
 
 
@@ -7935,7 +8100,7 @@ static const ber_sequence_t ReturnResult_sequence[] = {
 
 static int
 dissect_inap_ReturnResult(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 "inap.cnf"
+#line 181 "inap.cnf"
   inap_opcode_type=INAP_OPCODE_RETURN_RESULT;
 
 
@@ -7949,7 +8114,7 @@ dissect_inap_ReturnResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 static int
 dissect_inap_T_parameter(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 198 "inap.cnf"
+#line 196 "inap.cnf"
        offset = dissect_returnErrorData(tree, tvb, offset, actx);
 
 
@@ -7969,7 +8134,7 @@ static const ber_sequence_t ReturnError_sequence[] = {
 
 static int
 dissect_inap_ReturnError(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 186 "inap.cnf"
+#line 184 "inap.cnf"
   inap_opcode_type=INAP_OPCODE_RETURN_ERROR;
 
 
@@ -8055,7 +8220,7 @@ dissect_inap_ReturnErrorProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 }
 
 
-static const value_string inap_T_problem_vals[] = {
+static const value_string inap_T_problem_01_vals[] = {
   {   0, "general" },
   {   1, "invoke" },
   {   2, "returnResult" },
@@ -8063,7 +8228,7 @@ static const value_string inap_T_problem_vals[] = {
   { 0, NULL }
 };
 
-static const ber_choice_t T_problem_choice[] = {
+static const ber_choice_t T_problem_01_choice[] = {
   {   0, &hf_inap_general        , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_inap_GeneralProblem },
   {   1, &hf_inap_invokeProblem  , BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_inap_InvokeProblem },
   {   2, &hf_inap_problemReturnResult, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_inap_ReturnResultProblem },
@@ -8072,9 +8237,9 @@ static const ber_choice_t T_problem_choice[] = {
 };
 
 static int
-dissect_inap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_inap_T_problem_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_) {
   offset = dissect_ber_choice(actx, tree, tvb, offset,
-                                 T_problem_choice, hf_index, ett_inap_T_problem,
+                                 T_problem_01_choice, hf_index, ett_inap_T_problem_01,
                                  NULL);
 
   return offset;
@@ -8083,13 +8248,13 @@ dissect_inap_T_problem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 static const ber_sequence_t Reject_sequence[] = {
   { &hf_inap_invokeId       , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_InvokeId },
-  { &hf_inap_problem        , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_T_problem },
+  { &hf_inap_problem_01     , BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_inap_T_problem_01 },
   { NULL, 0, 0, 0, NULL }
 };
 
 static int
 dissect_inap_Reject(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 189 "inap.cnf"
+#line 187 "inap.cnf"
   inap_opcode_type=INAP_OPCODE_REJECT;
 
 
@@ -8125,39 +8290,6 @@ dissect_inap_ROS(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
   return offset;
 }
 
-
-static const value_string inap_RejectProblem_vals[] = {
-  {   0, "general-unrecognizedPDU" },
-  {   1, "general-mistypedPDU" },
-  {   2, "general-badlyStructuredPDU" },
-  {  10, "invoke-duplicateInvocation" },
-  {  11, "invoke-unrecognizedOperation" },
-  {  12, "invoke-mistypedArgument" },
-  {  13, "invoke-resourceLimitation" },
-  {  14, "invoke-releaseInProgress" },
-  {  15, "invoke-unrecognizedLinkedId" },
-  {  16, "invoke-linkedResponseUnexpected" },
-  {  17, "invoke-unexpectedLinkedOperation" },
-  {  20, "returnResult-unrecognizedInvocation" },
-  {  21, "returnResult-resultResponseUnexpected" },
-  {  22, "returnResult-mistypedResult" },
-  {  30, "returnError-unrecognizedInvocation" },
-  {  31, "returnError-errorResponseUnexpected" },
-  {  32, "returnError-unrecognizedError" },
-  {  33, "returnError-unexpectedError" },
-  {  34, "returnError-mistypedParameter" },
-  { 0, NULL }
-};
-
-
-static int
-dissect_inap_RejectProblem(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 ---*/
 
 static int dissect_ActivateServiceFilteringArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
@@ -8790,10 +8922,52 @@ static int dissect_SRFCallGapArg_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset = dissect_inap_SRFCallGapArg(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_SRFCallGapArg_PDU);
   return offset;
 }
+static int dissect_PAR_cancelFailed_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_PAR_cancelFailed(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_PAR_cancelFailed_PDU);
+  return offset;
+}
+static int dissect_PAR_requestedInfoError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_PAR_requestedInfoError(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_PAR_requestedInfoError_PDU);
+  return offset;
+}
+static int dissect_ScfTaskRefusedParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_ScfTaskRefusedParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_ScfTaskRefusedParameter_PDU);
+  return offset;
+}
+static int dissect_ReferralParameter_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_ReferralParameter(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_ReferralParameter_PDU);
+  return offset;
+}
+static int dissect_UnavailableNetworkResource_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_UnavailableNetworkResource(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_UnavailableNetworkResource_PDU);
+  return offset;
+}
+static int dissect_PAR_taskRefused_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
+  offset = dissect_inap_PAR_taskRefused(FALSE, tvb, offset, &asn1_ctx, tree, hf_inap_PAR_taskRefused_PDU);
+  return offset;
+}
 
 
 /*--- End of included file: packet-inap-fn.c ---*/
-#line 97 "packet-inap-template.c"
+#line 99 "packet-inap-template.c"
 /*
 TC-Invokable OPERATION ::=
   {activateServiceFiltering | activityTest | analysedInformation |
@@ -9121,7 +9295,24 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
   proto_item *cause;
 
   switch(errorCode) {
-/* Unknown or empty loop list ERROR.&ParameterType */
+    case errcode_cancelFailed:  /* cancelFailed */
+      dissect_PAR_cancelFailed_PDU(tvb, actx->pinfo , tree);
+      break;
+    case errcode_requestedInfoError:  /* requestedInfoError */
+      dissect_PAR_requestedInfoError_PDU(tvb, actx->pinfo , tree);
+      break;
+    case errcode_scfTaskRefused:  /* scfTaskRefused */
+      dissect_ScfTaskRefusedParameter_PDU(tvb, actx->pinfo , tree);
+      break;
+    case errcode_scfReferral:  /* scfReferral */
+      dissect_ReferralParameter_PDU(tvb, actx->pinfo , tree);
+      break;
+    case errcode_systemFailure:  /* systemFailure */
+      dissect_UnavailableNetworkResource_PDU(tvb, actx->pinfo , tree);
+      break;
+    case errcode_taskRefused:  /* taskRefused */
+      dissect_PAR_taskRefused_PDU(tvb, actx->pinfo , tree);
+      break;
   default:
     cause=proto_tree_add_text(tree, tvb, offset, -1, "Unknown returnErrorData blob");
     proto_item_set_expert_flags(cause, PI_MALFORMED, PI_WARN);
@@ -9132,7 +9323,7 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
 
 
 /*--- End of included file: packet-inap-table2.c ---*/
-#line 118 "packet-inap-template.c"
+#line 120 "packet-inap-template.c"
 
 
 static guint8 inap_pdu_type = 0;
@@ -9571,6 +9762,30 @@ void proto_register_inap(void) {
       { "SRFCallGapArg", "inap.SRFCallGapArg",
         FT_NONE, BASE_NONE, NULL, 0,
         "inap.SRFCallGapArg", HFILL }},
+    { &hf_inap_PAR_cancelFailed_PDU,
+      { "PAR-cancelFailed", "inap.PAR_cancelFailed",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "inap.PAR_cancelFailed", HFILL }},
+    { &hf_inap_PAR_requestedInfoError_PDU,
+      { "PAR-requestedInfoError", "inap.PAR_requestedInfoError",
+        FT_UINT32, BASE_DEC, VALS(inap_PAR_requestedInfoError_vals), 0,
+        "inap.PAR_requestedInfoError", HFILL }},
+    { &hf_inap_ScfTaskRefusedParameter_PDU,
+      { "ScfTaskRefusedParameter", "inap.ScfTaskRefusedParameter",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "inap.ScfTaskRefusedParameter", HFILL }},
+    { &hf_inap_ReferralParameter_PDU,
+      { "ReferralParameter", "inap.ReferralParameter",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "inap.ReferralParameter", HFILL }},
+    { &hf_inap_UnavailableNetworkResource_PDU,
+      { "UnavailableNetworkResource", "inap.UnavailableNetworkResource",
+        FT_UINT32, BASE_DEC, VALS(inap_UnavailableNetworkResource_vals), 0,
+        "inap.UnavailableNetworkResource", HFILL }},
+    { &hf_inap_PAR_taskRefused_PDU,
+      { "PAR-taskRefused", "inap.PAR_taskRefused",
+        FT_UINT32, BASE_DEC, VALS(inap_PAR_taskRefused_vals), 0,
+        "inap.PAR_taskRefused", HFILL }},
     { &hf_inap_Extensions_item,
       { "ExtensionField", "inap.ExtensionField",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -11315,6 +11530,26 @@ void proto_register_inap(void) {
       { "sRFgapCriteria", "inap.sRFgapCriteria",
         FT_UINT32, BASE_DEC, VALS(inap_SRFGapCriteria_vals), 0,
         "inap.SRFGapCriteria", HFILL }},
+    { &hf_inap_problem,
+      { "problem", "inap.problem",
+        FT_UINT32, BASE_DEC, VALS(inap_T_problem_vals), 0,
+        "inap.T_problem", HFILL }},
+    { &hf_inap_operation,
+      { "operation", "inap.operation",
+        FT_INT32, BASE_DEC, NULL, 0,
+        "inap.InvokeID", HFILL }},
+    { &hf_inap_reason_01,
+      { "reason", "inap.reason",
+        FT_UINT32, BASE_DEC, VALS(inap_T_reason_vals), 0,
+        "inap.T_reason", HFILL }},
+    { &hf_inap_securityParameters,
+      { "securityParameters", "inap.securityParameters",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "dap.SecurityParameters", HFILL }},
+    { &hf_inap_tryhere,
+      { "tryhere", "inap.tryhere",
+        FT_NONE, BASE_NONE, NULL, 0,
+        "dsp.AccessPointInformation", HFILL }},
     { &hf_inap_local_01,
       { "local", "inap.local",
         FT_INT32, BASE_DEC, NULL, 0,
@@ -11375,10 +11610,10 @@ void proto_register_inap(void) {
       { "parameter", "inap.parameter",
         FT_NONE, BASE_NONE, NULL, 0,
         "inap.T_parameter", HFILL }},
-    { &hf_inap_problem,
+    { &hf_inap_problem_01,
       { "problem", "inap.problem",
-        FT_UINT32, BASE_DEC, VALS(inap_T_problem_vals), 0,
-        "inap.T_problem", HFILL }},
+        FT_UINT32, BASE_DEC, VALS(inap_T_problem_01_vals), 0,
+        "inap.T_problem_01", HFILL }},
     { &hf_inap_general,
       { "general", "inap.general",
         FT_INT32, BASE_DEC, VALS(inap_GeneralProblem_vals), 0,
@@ -11405,7 +11640,7 @@ void proto_register_inap(void) {
         "inap.InvokeId_present", HFILL }},
 
 /*--- End of included file: packet-inap-hfarr.c ---*/
-#line 194 "packet-inap-template.c"
+#line 196 "packet-inap-template.c"
   };
 
 
@@ -11644,6 +11879,9 @@ void proto_register_inap(void) {
     &ett_inap_ScriptInformationArg,
     &ett_inap_ScriptRunArg,
     &ett_inap_SRFCallGapArg,
+    &ett_inap_PAR_cancelFailed,
+    &ett_inap_ScfTaskRefusedParameter,
+    &ett_inap_ReferralParameter,
     &ett_inap_Code,
     &ett_inap_ROS,
     &ett_inap_Invoke,
@@ -11652,11 +11890,11 @@ void proto_register_inap(void) {
     &ett_inap_T_result,
     &ett_inap_ReturnError,
     &ett_inap_Reject,
-    &ett_inap_T_problem,
+    &ett_inap_T_problem_01,
     &ett_inap_InvokeId,
 
 /*--- End of included file: packet-inap-ettarr.c ---*/
-#line 207 "packet-inap-template.c"
+#line 209 "packet-inap-template.c"
   };
 
   /* Register protocol */
index 856273e39b409cbbef90aac1ee38cef9b238fe96..aa97b4c152554bbe5a4b59443b5ce586f2997c05 100644 (file)
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-inap.h                                                              */
-/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
+/* ../../tools/asn2wrs.py -b -e -p inap -c ./inap.cnf -s ./packet-inap-template -D . IN-common-classes.asn IN-SSF-SCF-Classes.asn IN-SCF-SRF-Classes.asn IN-operationcodes.asn IN-object-identifiers.asn IN-common-datatypes.asn IN-SSF-SCF-datatypes.asn IN-SSF-SCF-ops-args.asn IN-SCF-SRF-datatypes.asn IN-SCF-SRF-ops-args.asn IN-errorcodes.asn IN-errortypes.asn ../ros/Remote-Operations-Information-Objects.asn ../ros/Remote-Operations-Generic-ROS-PDUs.asn */
 
 /* Input file: packet-inap-template.h */
 
index 75d0aba3787e4ad769fef441e6e80e2120502d16..d477ffb8c0b0a93bf26a39dacc455674696fc73b 100644 (file)
@@ -5474,7 +5474,6 @@ static int hf_rrc_pathloss = -1;                  /* Pathloss */
 static int hf_rrc_tdd_82 = -1;                    /* T_tdd_76 */
 static int hf_rrc_proposedTGSN = -1;              /* TGSN */
 static int hf_rrc_timeslotISCP_List = -1;         /* TimeslotISCP_List */
-static int hf_rrc_cellMeasuredResults = -1;       /* CellMeasuredResults */
 static int hf_rrc_csgIdentity = -1;               /* CSG_Identity */
 static int hf_rrc_csgMemberIndication = -1;       /* T_csgMemberIndication */
 static int hf_rrc_fdd_129 = -1;                   /* SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCPICH_Info */
@@ -5698,8 +5697,6 @@ static int hf_rrc_ForbiddenAffectCellList_r4_item = -1;  /* ForbiddenAffectCell_
 static int hf_rrc_ForbiddenAffectCellList_LCR_r4_item = -1;  /* ForbiddenAffectCell_LCR_r4 */
 static int hf_rrc_ganssTod = -1;                  /* INTEGER_0_86399 */
 static int hf_rrc_dataBitAssistance = -1;         /* ReqDataBitAssistance */
-static int hf_rrc_currentDecipheringKey = -1;     /* BIT_STRING_SIZE_56 */
-static int hf_rrc_nextDecipheringKey = -1;        /* BIT_STRING_SIZE_56 */
 static int hf_rrc_ganssId = -1;                   /* INTEGER_0_7 */
 static int hf_rrc_ganssTimeModelsList = -1;       /* GANSSTimeModelsList */
 static int hf_rrc_uePositioningDGANSSCorrections = -1;  /* UE_Positioning_DGANSSCorrections */
@@ -5890,7 +5887,6 @@ static int hf_rrc_tlm_Reserved = -1;              /* BIT_STRING_SIZE_2 */
 static int hf_rrc_alert = -1;                     /* BOOLEAN */
 static int hf_rrc_antiSpoof = -1;                 /* BOOLEAN */
 static int hf_rrc_GPS_TOW_AssistList_item = -1;   /* GPS_TOW_Assist */
-static int hf_rrc_gsm_CellID = -1;                /* INTEGER_0_maxCellMeas_1 */
 static int hf_rrc_gsmCellGroup = -1;              /* GSM_CellGroup */
 static int hf_rrc_qRxLevMinGSM = -1;              /* INTEGER_M58_M13 */
 static int hf_rrc_GSM_PriorityInfoList_item = -1;  /* GSM_PriorityInfo */
@@ -5957,7 +5953,6 @@ static int hf_rrc_threholdNonUsedFrequency_deltaList = -1;  /* ThreholdNonUsedFr
 static int hf_rrc_Inter_FreqEventCriteriaList_v590ext_item = -1;  /* Inter_FreqEventCriteria_v590ext */
 static int hf_rrc_Intra_FreqEventCriteriaList_v590ext_item = -1;  /* DeltaRSCP */
 static int hf_rrc_IntraFrequencyMeasuredResultsList_v590ext_item = -1;  /* DeltaRSCPPerCell */
-static int hf_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq_item = -1;  /* CellMeasuredResultsListOnSecULFreq */
 static int hf_rrc_IntraFreqMeasuredResultsList_v9xyext_item = -1;  /* CellMeasuredResults_v9xyext */
 static int hf_rrc_eventID_01 = -1;                /* EventIDInterFreq */
 static int hf_rrc_interFreqCellList = -1;         /* InterFreqCellList */
@@ -11885,7 +11880,6 @@ static gint ett_rrc_CellMeasuredResults = -1;
 static gint ett_rrc_T_modeSpecificInfo_86 = -1;
 static gint ett_rrc_T_fdd_125 = -1;
 static gint ett_rrc_T_tdd_76 = -1;
-static gint ett_rrc_CellMeasuredResultsListOnSecULFreq = -1;
 static gint ett_rrc_CellMeasuredResults_v9xyext = -1;
 static gint ett_rrc_CellMeasurementEventResults = -1;
 static gint ett_rrc_SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCPICH_Info = -1;
@@ -12026,7 +12020,6 @@ static gint ett_rrc_ForbiddenAffectCellList = -1;
 static gint ett_rrc_ForbiddenAffectCellList_r4 = -1;
 static gint ett_rrc_ForbiddenAffectCellList_LCR_r4 = -1;
 static gint ett_rrc_GanssDataBits = -1;
-static gint ett_rrc_GANSSDecipheringKeys = -1;
 static gint ett_rrc_GANSSGenericData = -1;
 static gint ett_rrc_GANSSGenericData_v860ext = -1;
 static gint ett_rrc_GANSSGenericData_r8 = -1;
@@ -12086,7 +12079,6 @@ static gint ett_rrc_GSM_MeasuredResults = -1;
 static gint ett_rrc_GSM_MeasuredResultsList = -1;
 static gint ett_rrc_GPS_TOW_Assist = -1;
 static gint ett_rrc_GPS_TOW_AssistList = -1;
-static gint ett_rrc_GSM_CellID = -1;
 static gint ett_rrc_GSM_PriorityInfo = -1;
 static gint ett_rrc_GSM_PriorityInfoList = -1;
 static gint ett_rrc_HCS_CellReselectInformation_RSCP = -1;
@@ -12131,7 +12123,6 @@ static gint ett_rrc_Inter_FreqEventCriteria_v590ext = -1;
 static gint ett_rrc_Inter_FreqEventCriteriaList_v590ext = -1;
 static gint ett_rrc_Intra_FreqEventCriteriaList_v590ext = -1;
 static gint ett_rrc_IntraFrequencyMeasuredResultsList_v590ext = -1;
-static gint ett_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq = -1;
 static gint ett_rrc_IntraFreqMeasuredResultsList_v9xyext = -1;
 static gint ett_rrc_IntraFreqReportingCriteria_1b_r5 = -1;
 static gint ett_rrc_PeriodicReportingInfo_1b = -1;
@@ -23893,7 +23884,7 @@ static const per_choice_t ActiveSetUpdate_choice[] = {
 
 static int
 dissect_rrc_ActiveSetUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 117 "rrc.cnf"
+#line 121 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdate");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_ActiveSetUpdate, ActiveSetUpdate_choice,
@@ -28218,7 +28209,7 @@ static const per_choice_t AssistanceDataDelivery_choice[] = {
 
 static int
 dissect_rrc_AssistanceDataDelivery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 129 "rrc.cnf"
+#line 133 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "AssistanceDataDelivery");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_AssistanceDataDelivery, AssistanceDataDelivery_choice,
@@ -28616,7 +28607,7 @@ static const per_choice_t CellChangeOrderFromUTRAN_choice[] = {
 
 static int
 dissect_rrc_CellChangeOrderFromUTRAN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 133 "rrc.cnf"
+#line 137 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRAN");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellChangeOrderFromUTRAN, CellChangeOrderFromUTRAN_choice,
@@ -47513,7 +47504,7 @@ static const per_choice_t CellUpdateConfirm_choice[] = {
 
 static int
 dissect_rrc_CellUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 149 "rrc.cnf"
+#line 153 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellUpdateConfirm, CellUpdateConfirm_choice,
@@ -47666,7 +47657,7 @@ static const per_choice_t CounterCheck_choice[] = {
 
 static int
 dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 153 "rrc.cnf"
+#line 157 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheck");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CounterCheck, CounterCheck_choice,
@@ -47682,7 +47673,7 @@ dissect_rrc_CounterCheck(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_
 
 static int
 dissect_rrc_NAS_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 99 "rrc.cnf"
+#line 103 "rrc.cnf"
   tvbuff_t *nas_message_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -47799,7 +47790,7 @@ static const per_choice_t DownlinkDirectTransfer_choice[] = {
 
 static int
 dissect_rrc_DownlinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 161 "rrc.cnf"
+#line 165 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "DownlinkDirectTransfer");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_DownlinkDirectTransfer, DownlinkDirectTransfer_choice,
@@ -47818,7 +47809,7 @@ static const per_sequence_t T_single_GSM_Message_r3_sequence[] = {
 
 static int
 dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 449 "rrc.cnf"
+#line 453 "rrc.cnf"
   tvbuff_t *gsm_message_tvb=NULL;
   guint bits_remaining, whole_octets_remaining;
 
@@ -47843,7 +47834,7 @@ dissect_rrc_T_single_GSM_Message_r3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 static int
 dissect_rrc_GSM_MessageList_item(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 441 "rrc.cnf"
+#line 445 "rrc.cnf"
   tvbuff_t *gsm_messagelist_tvb=NULL;
   
   offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
@@ -48127,7 +48118,7 @@ static const per_sequence_t T_single_GSM_Message_r6_sequence[] = {
 
 static int
 dissect_rrc_T_single_GSM_Message_r6(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 463 "rrc.cnf"
+#line 467 "rrc.cnf"
   tvbuff_t *gsm_message_tvb=NULL;
   guint bits_remaining, whole_octets_remaining;
 
@@ -48333,7 +48324,7 @@ static const per_choice_t HandoverFromUTRANCommand_GSM_choice[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_GSM(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 173 "rrc.cnf"
+#line 177 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GSM");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverFromUTRANCommand_GSM, HandoverFromUTRANCommand_GSM_choice,
@@ -48487,7 +48478,7 @@ static const per_choice_t HandoverFromUTRANCommand_CDMA2000_choice[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_CDMA2000(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 177 "rrc.cnf"
+#line 181 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-CDMA2000");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_HandoverFromUTRANCommand_CDMA2000, HandoverFromUTRANCommand_CDMA2000_choice,
@@ -57233,7 +57224,7 @@ static const per_choice_t MeasurementControl_choice[] = {
 
 static int
 dissect_rrc_MeasurementControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 229 "rrc.cnf"
+#line 233 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControl");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_MeasurementControl, MeasurementControl_choice,
@@ -57325,7 +57316,7 @@ static const per_sequence_t PagingType2_sequence[] = {
 
 static int
 dissect_rrc_PagingType2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 245 "rrc.cnf"
+#line 249 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType2");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PagingType2, PagingType2_sequence);
@@ -58701,7 +58692,7 @@ static const per_choice_t PhysicalChannelReconfiguration_choice[] = {
 
 static int
 dissect_rrc_PhysicalChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 249 "rrc.cnf"
+#line 253 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfiguration");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_PhysicalChannelReconfiguration, PhysicalChannelReconfiguration_choice,
@@ -60005,7 +59996,7 @@ static const per_choice_t PhysicalSharedChannelAllocation_choice[] = {
 
 static int
 dissect_rrc_PhysicalSharedChannelAllocation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 261 "rrc.cnf"
+#line 265 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalSharedChannelAllocation");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_PhysicalSharedChannelAllocation, PhysicalSharedChannelAllocation_choice,
@@ -62210,7 +62201,7 @@ static const per_choice_t RadioBearerReconfiguration_choice[] = {
 
 static int
 dissect_rrc_RadioBearerReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 269 "rrc.cnf"
+#line 273 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfiguration");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RadioBearerReconfiguration, RadioBearerReconfiguration_choice,
@@ -63622,7 +63613,7 @@ static const per_choice_t RadioBearerRelease_choice[] = {
 
 static int
 dissect_rrc_RadioBearerRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 281 "rrc.cnf"
+#line 285 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RadioBearerRelease, RadioBearerRelease_choice,
@@ -65800,7 +65791,7 @@ static const per_choice_t RadioBearerSetup_choice[] = {
 
 static int
 dissect_rrc_RadioBearerSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 293 "rrc.cnf"
+#line 297 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetup");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RadioBearerSetup, RadioBearerSetup_choice,
@@ -66450,7 +66441,7 @@ static const per_choice_t RRCConnectionRelease_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 309 "rrc.cnf"
+#line 313 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionRelease, RRCConnectionRelease_choice,
@@ -66729,7 +66720,7 @@ static const per_choice_t SecurityModeCommand_choice[] = {
 
 static int
 dissect_rrc_SecurityModeCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 337 "rrc.cnf"
+#line 341 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeCommand");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_SecurityModeCommand, SecurityModeCommand_choice,
@@ -66842,7 +66833,7 @@ static const per_choice_t SignallingConnectionRelease_choice[] = {
 
 static int
 dissect_rrc_SignallingConnectionRelease(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 349 "rrc.cnf"
+#line 353 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionRelease");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_SignallingConnectionRelease, SignallingConnectionRelease_choice,
@@ -68256,7 +68247,7 @@ static const per_choice_t TransportChannelReconfiguration_choice[] = {
 
 static int
 dissect_rrc_TransportChannelReconfiguration(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 369 "rrc.cnf"
+#line 373 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfiguration");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_TransportChannelReconfiguration, TransportChannelReconfiguration_choice,
@@ -68401,7 +68392,7 @@ static const per_sequence_t TransportFormatCombinationControl_sequence[] = {
 
 static int
 dissect_rrc_TransportFormatCombinationControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 381 "rrc.cnf"
+#line 385 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControl");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportFormatCombinationControl, TransportFormatCombinationControl_sequence);
@@ -68767,7 +68758,7 @@ static const per_choice_t UECapabilityEnquiry_choice[] = {
 
 static int
 dissect_rrc_UECapabilityEnquiry(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 389 "rrc.cnf"
+#line 393 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityEnquiry");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UECapabilityEnquiry, UECapabilityEnquiry_choice,
@@ -68925,7 +68916,7 @@ static const per_choice_t UECapabilityInformationConfirm_choice[] = {
 
 static int
 dissect_rrc_UECapabilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 397 "rrc.cnf"
+#line 401 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformationConfirm");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UECapabilityInformationConfirm, UECapabilityInformationConfirm_choice,
@@ -69689,7 +69680,7 @@ static const per_choice_t UplinkPhysicalChannelControl_choice[] = {
 
 static int
 dissect_rrc_UplinkPhysicalChannelControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 405 "rrc.cnf"
+#line 409 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkPhysicalChannelControl");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UplinkPhysicalChannelControl, UplinkPhysicalChannelControl_choice,
@@ -70032,7 +70023,7 @@ static const per_choice_t URAUpdateConfirm_choice[] = {
 
 static int
 dissect_rrc_URAUpdateConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 413 "rrc.cnf"
+#line 417 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_URAUpdateConfirm, URAUpdateConfirm_choice,
@@ -71485,7 +71476,7 @@ static const per_choice_t UTRANMobilityInformation_choice[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 421 "rrc.cnf"
+#line 425 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformation");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_UTRANMobilityInformation, UTRANMobilityInformation_choice,
@@ -71672,7 +71663,7 @@ static const per_sequence_t HandoverFromUTRANCommand_GERANIu_sequence[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANCommand_GERANIu(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 169 "rrc.cnf"
+#line 173 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANCommand-GERANIu");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverFromUTRANCommand_GERANIu, HandoverFromUTRANCommand_GERANIu_sequence);
@@ -72110,7 +72101,7 @@ static const per_sequence_t MBMSModifiedServicesInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSModifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 213 "rrc.cnf"
+#line 217 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModifiedServicesInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSModifiedServicesInformation, MBMSModifiedServicesInformation_sequence);
@@ -72492,7 +72483,7 @@ static const per_sequence_t ActiveSetUpdateComplete_sequence[] = {
 
 static int
 dissect_rrc_ActiveSetUpdateComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 121 "rrc.cnf"
+#line 125 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_ActiveSetUpdateComplete, ActiveSetUpdateComplete_sequence);
@@ -72663,7 +72654,7 @@ static const per_sequence_t ActiveSetUpdateFailure_sequence[] = {
 
 static int
 dissect_rrc_ActiveSetUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 125 "rrc.cnf"
+#line 129 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "ActiveSetUpdateFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_ActiveSetUpdateFailure, ActiveSetUpdateFailure_sequence);
@@ -72810,7 +72801,7 @@ static const per_choice_t CellChangeOrderFromUTRANFailure_choice[] = {
 
 static int
 dissect_rrc_CellChangeOrderFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 137 "rrc.cnf"
+#line 141 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellChangeOrderFromUTRANFailure");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellChangeOrderFromUTRANFailure, CellChangeOrderFromUTRANFailure_choice,
@@ -72900,7 +72891,7 @@ static const per_sequence_t CounterCheckResponse_sequence[] = {
 
 static int
 dissect_rrc_CounterCheckResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 157 "rrc.cnf"
+#line 161 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CounterCheckResponse");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_CounterCheckResponse, CounterCheckResponse_sequence);
@@ -72949,7 +72940,7 @@ static const per_sequence_t HandoverToUTRANComplete_sequence[] = {
 
 static int
 dissect_rrc_HandoverToUTRANComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 165 "rrc.cnf"
+#line 169 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverToUTRANComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverToUTRANComplete, HandoverToUTRANComplete_sequence);
@@ -73866,7 +73857,7 @@ static const per_sequence_t InitialDirectTransfer_sequence[] = {
 
 static int
 dissect_rrc_InitialDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 185 "rrc.cnf"
+#line 189 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "InitialDirectTransfer");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_InitialDirectTransfer, InitialDirectTransfer_sequence);
@@ -74074,7 +74065,7 @@ static const per_sequence_t HandoverFromUTRANFailure_sequence[] = {
 
 static int
 dissect_rrc_HandoverFromUTRANFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 181 "rrc.cnf"
+#line 185 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "HandoverFromUTRANFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_HandoverFromUTRANFailure, HandoverFromUTRANFailure_sequence);
@@ -74152,7 +74143,7 @@ static const per_sequence_t MeasurementControlFailure_sequence[] = {
 
 static int
 dissect_rrc_MeasurementControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 233 "rrc.cnf"
+#line 237 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementControlFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MeasurementControlFailure, MeasurementControlFailure_sequence);
@@ -78388,7 +78379,7 @@ static const per_sequence_t MeasurementReport_sequence[] = {
 
 static int
 dissect_rrc_MeasurementReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 237 "rrc.cnf"
+#line 241 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MeasurementReport");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MeasurementReport, MeasurementReport_sequence);
@@ -78486,7 +78477,7 @@ static const per_sequence_t PhysicalChannelReconfigurationComplete_sequence[] =
 
 static int
 dissect_rrc_PhysicalChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 253 "rrc.cnf"
+#line 257 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PhysicalChannelReconfigurationComplete, PhysicalChannelReconfigurationComplete_sequence);
@@ -78535,7 +78526,7 @@ static const per_sequence_t PhysicalChannelReconfigurationFailure_sequence[] = {
 
 static int
 dissect_rrc_PhysicalChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 257 "rrc.cnf"
+#line 261 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PhysicalChannelReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PhysicalChannelReconfigurationFailure, PhysicalChannelReconfigurationFailure_sequence);
@@ -78633,7 +78624,7 @@ static const per_sequence_t RadioBearerReconfigurationComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 273 "rrc.cnf"
+#line 277 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReconfigurationComplete, RadioBearerReconfigurationComplete_sequence);
@@ -78697,7 +78688,7 @@ static const per_sequence_t RadioBearerReconfigurationFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 277 "rrc.cnf"
+#line 281 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReconfigurationFailure, RadioBearerReconfigurationFailure_sequence);
@@ -78795,7 +78786,7 @@ static const per_sequence_t RadioBearerReleaseComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 285 "rrc.cnf"
+#line 289 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReleaseComplete, RadioBearerReleaseComplete_sequence);
@@ -78845,7 +78836,7 @@ static const per_sequence_t RadioBearerReleaseFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerReleaseFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 289 "rrc.cnf"
+#line 293 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerReleaseFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerReleaseFailure, RadioBearerReleaseFailure_sequence);
@@ -78944,7 +78935,7 @@ static const per_sequence_t RadioBearerSetupComplete_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 297 "rrc.cnf"
+#line 301 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerSetupComplete, RadioBearerSetupComplete_sequence);
@@ -78994,7 +78985,7 @@ static const per_sequence_t RadioBearerSetupFailure_sequence[] = {
 
 static int
 dissect_rrc_RadioBearerSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 301 "rrc.cnf"
+#line 305 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RadioBearerSetupFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RadioBearerSetupFailure, RadioBearerSetupFailure_sequence);
@@ -79043,7 +79034,7 @@ static const per_sequence_t RRCConnectionReleaseComplete_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 317 "rrc.cnf"
+#line 321 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReleaseComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionReleaseComplete, RRCConnectionReleaseComplete_sequence);
@@ -80058,7 +80049,7 @@ dissect_rrc_UE_RadioAccessCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_rrc_GSM_Classmark2(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 477 "rrc.cnf"
+#line 481 "rrc.cnf"
 tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -80077,7 +80068,7 @@ tvbuff_t *parameter_tvb=NULL;
 
 static int
 dissect_rrc_GSM_Classmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 485 "rrc.cnf"
+#line 489 "rrc.cnf"
 tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -81486,7 +81477,7 @@ static const per_sequence_t RRCConnectionSetupComplete_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionSetupComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 329 "rrc.cnf"
+#line 333 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetupComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionSetupComplete, RRCConnectionSetupComplete_sequence);
@@ -81665,7 +81656,7 @@ static const per_sequence_t RRCStatus_sequence[] = {
 
 static int
 dissect_rrc_RRCStatus(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 333 "rrc.cnf"
+#line 337 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCStatus");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCStatus, RRCStatus_sequence);
@@ -81715,7 +81706,7 @@ static const per_sequence_t SecurityModeComplete_sequence[] = {
 
 static int
 dissect_rrc_SecurityModeComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 341 "rrc.cnf"
+#line 345 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SecurityModeComplete, SecurityModeComplete_sequence);
@@ -81764,7 +81755,7 @@ static const per_sequence_t SecurityModeFailure_sequence[] = {
 
 static int
 dissect_rrc_SecurityModeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 345 "rrc.cnf"
+#line 349 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SecurityModeFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SecurityModeFailure, SecurityModeFailure_sequence);
@@ -81857,7 +81848,7 @@ static const per_sequence_t SignallingConnectionReleaseIndication_sequence[] = {
 
 static int
 dissect_rrc_SignallingConnectionReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 353 "rrc.cnf"
+#line 357 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SignallingConnectionReleaseIndication");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SignallingConnectionReleaseIndication, SignallingConnectionReleaseIndication_sequence);
@@ -81955,7 +81946,7 @@ static const per_sequence_t TransportChannelReconfigurationComplete_sequence[] =
 
 static int
 dissect_rrc_TransportChannelReconfigurationComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 373 "rrc.cnf"
+#line 377 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationComplete");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportChannelReconfigurationComplete, TransportChannelReconfigurationComplete_sequence);
@@ -82004,7 +81995,7 @@ static const per_sequence_t TransportChannelReconfigurationFailure_sequence[] =
 
 static int
 dissect_rrc_TransportChannelReconfigurationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 377 "rrc.cnf"
+#line 381 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportChannelReconfigurationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportChannelReconfigurationFailure, TransportChannelReconfigurationFailure_sequence);
@@ -82053,7 +82044,7 @@ static const per_sequence_t TransportFormatCombinationControlFailure_sequence[]
 
 static int
 dissect_rrc_TransportFormatCombinationControlFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 385 "rrc.cnf"
+#line 389 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "TransportFormatCombinationControlFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_TransportFormatCombinationControlFailure, TransportFormatCombinationControlFailure_sequence);
@@ -82329,7 +82320,7 @@ static const per_sequence_t UECapabilityInformation_sequence[] = {
 
 static int
 dissect_rrc_UECapabilityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 393 "rrc.cnf"
+#line 397 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UECapabilityInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UECapabilityInformation, UECapabilityInformation_sequence);
@@ -82408,7 +82399,7 @@ static const per_sequence_t UplinkDirectTransfer_sequence[] = {
 
 static int
 dissect_rrc_UplinkDirectTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 401 "rrc.cnf"
+#line 405 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UplinkDirectTransfer");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UplinkDirectTransfer, UplinkDirectTransfer_sequence);
@@ -82504,7 +82495,7 @@ static const per_sequence_t UTRANMobilityInformationConfirm_sequence[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 425 "rrc.cnf"
+#line 429 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationConfirm");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UTRANMobilityInformationConfirm, UTRANMobilityInformationConfirm_sequence);
@@ -82553,7 +82544,7 @@ static const per_sequence_t UTRANMobilityInformationFailure_sequence[] = {
 
 static int
 dissect_rrc_UTRANMobilityInformationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 429 "rrc.cnf"
+#line 433 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "UTRANMobilityInformationFailure");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_UTRANMobilityInformationFailure, UTRANMobilityInformationFailure_sequence);
@@ -82710,7 +82701,7 @@ static const per_sequence_t MBMSModificationRequest_sequence[] = {
 
 static int
 dissect_rrc_MBMSModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 209 "rrc.cnf"
+#line 213 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSModificationRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSModificationRequest, MBMSModificationRequest_sequence);
@@ -83446,7 +83437,7 @@ static const per_choice_t CellUpdateConfirm_CCCH_choice[] = {
 
 static int
 dissect_rrc_CellUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 145 "rrc.cnf"
+#line 149 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdateConfirm-CCCH");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_CellUpdateConfirm_CCCH, CellUpdateConfirm_CCCH_choice,
@@ -83900,7 +83891,7 @@ static const per_choice_t RRCConnectionReject_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionReject(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 305 "rrc.cnf"
+#line 309 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionReject");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionReject, RRCConnectionReject_choice,
@@ -84396,7 +84387,7 @@ static const per_choice_t RRCConnectionRelease_CCCH_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionRelease_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 313 "rrc.cnf"
+#line 317 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRelease-CCCH");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionRelease_CCCH, RRCConnectionRelease_CCCH_choice,
@@ -86004,7 +85995,7 @@ static const per_choice_t RRCConnectionSetup_choice[] = {
 
 static int
 dissect_rrc_RRCConnectionSetup(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 325 "rrc.cnf"
+#line 329 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionSetup");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_RRCConnectionSetup, RRCConnectionSetup_choice,
@@ -86148,7 +86139,7 @@ static const per_choice_t URAUpdateConfirm_CCCH_choice[] = {
 
 static int
 dissect_rrc_URAUpdateConfirm_CCCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 417 "rrc.cnf"
+#line 421 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdateConfirm-CCCH");
   offset = dissect_per_choice(tvb, offset, actx, tree, hf_index,
                                  ett_rrc_URAUpdateConfirm_CCCH, URAUpdateConfirm_CCCH_choice,
@@ -86680,7 +86671,7 @@ static const per_sequence_t CellUpdate_sequence[] = {
 
 static int
 dissect_rrc_CellUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 141 "rrc.cnf"
+#line 145 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "CellUpdate");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_CellUpdate, CellUpdate_sequence);
@@ -87320,7 +87311,7 @@ static const per_sequence_t RRCConnectionRequest_sequence[] = {
 
 static int
 dissect_rrc_RRCConnectionRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 321 "rrc.cnf"
+#line 325 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "RRCConnectionRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_RRCConnectionRequest, RRCConnectionRequest_sequence);
@@ -87571,7 +87562,7 @@ static const per_sequence_t URAUpdate_sequence[] = {
 
 static int
 dissect_rrc_URAUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 409 "rrc.cnf"
+#line 413 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "URAUpdate");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_URAUpdate, URAUpdate_sequence);
@@ -87994,7 +87985,7 @@ static const per_sequence_t PagingType1_sequence[] = {
 
 static int
 dissect_rrc_PagingType1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 241 "rrc.cnf"
+#line 245 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PagingType1");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PagingType1, PagingType1_sequence);
@@ -88199,7 +88190,7 @@ static const per_sequence_t PUSCHCapacityRequest_sequence[] = {
 
 static int
 dissect_rrc_PUSCHCapacityRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 265 "rrc.cnf"
+#line 269 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "PUSCHCapacityRequest");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_PUSCHCapacityRequest, PUSCHCapacityRequest_sequence);
@@ -88575,7 +88566,7 @@ static const per_sequence_t SystemInformation_FACH_sequence[] = {
 
 static int
 dissect_rrc_SystemInformation_FACH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 361 "rrc.cnf"
+#line 365 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-FACH");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformation_FACH, SystemInformation_FACH_sequence);
@@ -88652,7 +88643,7 @@ static const per_sequence_t SystemInformationChangeIndication_sequence[] = {
 
 static int
 dissect_rrc_SystemInformationChangeIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 365 "rrc.cnf"
+#line 369 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformationChangeIndication");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformationChangeIndication, SystemInformationChangeIndication_sequence);
@@ -88833,7 +88824,7 @@ static const per_sequence_t SystemInformation_BCH_sequence[] = {
 
 static int
 dissect_rrc_SystemInformation_BCH(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 357 "rrc.cnf"
+#line 361 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "SystemInformation-BCH");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_SystemInformation_BCH, SystemInformation_BCH_sequence);
@@ -88973,7 +88964,7 @@ static const per_sequence_t MBMSAccessInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSAccessInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 189 "rrc.cnf"
+#line 193 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSAccessInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSAccessInformation, MBMSAccessInformation_sequence);
@@ -89842,7 +89833,7 @@ static const per_sequence_t MBMSCommonPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSCommonPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 193 "rrc.cnf"
+#line 197 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCommonPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSCommonPTMRBInformation, MBMSCommonPTMRBInformation_sequence);
@@ -90230,7 +90221,7 @@ static const per_sequence_t MBMSCurrentCellPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSCurrentCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 197 "rrc.cnf"
+#line 201 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSCurrentCellPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSCurrentCellPTMRBInformation, MBMSCurrentCellPTMRBInformation_sequence);
@@ -91008,7 +90999,7 @@ static const per_sequence_t MBMSGeneralInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSGeneralInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 205 "rrc.cnf"
+#line 209 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSGeneralInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSGeneralInformation, MBMSGeneralInformation_sequence);
@@ -91682,7 +91673,7 @@ static const per_sequence_t MBMSNeighbouringCellPTMRBInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSNeighbouringCellPTMRBInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 217 "rrc.cnf"
+#line 221 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSNeighbouringCellPTMRBInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSNeighbouringCellPTMRBInformation, MBMSNeighbouringCellPTMRBInformation_sequence);
@@ -91819,7 +91810,7 @@ static const per_sequence_t MBMSUnmodifiedServicesInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSUnmodifiedServicesInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 225 "rrc.cnf"
+#line 229 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSUnmodifiedServicesInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSUnmodifiedServicesInformation, MBMSUnmodifiedServicesInformation_sequence);
@@ -91975,7 +91966,7 @@ static const per_sequence_t MBMSSchedulingInformation_sequence[] = {
 
 static int
 dissect_rrc_MBMSSchedulingInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 221 "rrc.cnf"
+#line 225 "rrc.cnf"
   col_append_str(actx->pinfo->cinfo, COL_INFO, "MBMSSchedulingInformation");
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
                                    ett_rrc_MBMSSchedulingInformation, MBMSSchedulingInformation_sequence);
@@ -94861,7 +94852,7 @@ dissect_rrc_T_uE_SecurityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx
 
 static int
 dissect_rrc_T_present(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 107 "rrc.cnf"
+#line 111 "rrc.cnf"
   tvbuff_t *ue_radio_access_cap_info_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -106075,20 +106066,6 @@ dissect_rrc_CellInfoSI_HCS_ECN0_LCR_r4(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 }
 
 
-static const per_sequence_t CellMeasuredResultsListOnSecULFreq_sequence[] = {
-  { &hf_rrc_cellMeasuredResults, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrc_CellMeasuredResults },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_rrc_CellMeasuredResultsListOnSecULFreq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_rrc_CellMeasuredResultsListOnSecULFreq, CellMeasuredResultsListOnSecULFreq_sequence);
-
-  return offset;
-}
-
-
 
 static int
 dissect_rrc_DeltaQrxlevmin(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -106271,55 +106248,6 @@ dissect_rrc_FACH_MeasurementOccasionInfo_LCR_r4_ext(tvbuff_t *tvb _U_, int offse
 
 
 
-static int
-dissect_rrc_BIT_STRING_SIZE_56(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index,
-                                     56, 56, FALSE, NULL);
-
-  return offset;
-}
-
-
-static const per_sequence_t GANSSDecipheringKeys_sequence[] = {
-  { &hf_rrc_currentDecipheringKey, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrc_BIT_STRING_SIZE_56 },
-  { &hf_rrc_nextDecipheringKey, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrc_BIT_STRING_SIZE_56 },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_rrc_GANSSDecipheringKeys(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_rrc_GANSSDecipheringKeys, GANSSDecipheringKeys_sequence);
-
-  return offset;
-}
-
-
-
-static int
-dissect_rrc_INTEGER_0_maxCellMeas_1(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
-                                                            0U, maxCellMeas_1, NULL, FALSE);
-
-  return offset;
-}
-
-
-static const per_sequence_t GSM_CellID_sequence[] = {
-  { &hf_rrc_gsm_CellID      , ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrc_INTEGER_0_maxCellMeas_1 },
-  { NULL, 0, 0, NULL }
-};
-
-static int
-dissect_rrc_GSM_CellID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
-                                   ett_rrc_GSM_CellID, GSM_CellID_sequence);
-
-  return offset;
-}
-
-
-
 static int
 dissect_rrc_INTEGER_M58_M13(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
@@ -106721,20 +106649,6 @@ dissect_rrc_InterFreqCellInfoSI_List_HCS_ECN0_LCR(tvbuff_t *tvb _U_, int offset
 }
 
 
-static const per_sequence_t IntraFrequencyMeasuredResultsListOnSecULFreq_sequence_of[1] = {
-  { &hf_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq_item, ASN1_NO_EXTENSIONS     , ASN1_NOT_OPTIONAL, dissect_rrc_CellMeasuredResultsListOnSecULFreq },
-};
-
-static int
-dissect_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_per_constrained_sequence_of(tvb, offset, actx, tree, hf_index,
-                                                  ett_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq, IntraFrequencyMeasuredResultsListOnSecULFreq_sequence_of,
-                                                  1, maxCellMeasOnSecULFreq, FALSE);
-
-  return offset;
-}
-
-
 static const per_sequence_t InterFreqMeasurementSysInfo_RSCP_sequence[] = {
   { &hf_rrc_interFreqCellInfoSI_List, ASN1_NO_EXTENSIONS     , ASN1_OPTIONAL    , dissect_rrc_InterFreqCellInfoSI_List_RSCP },
   { NULL, 0, 0, NULL }
@@ -113514,7 +113428,7 @@ dissect_rrc_UE_HistoryInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_rrc_T_interRATHandoverInfo(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 492 "rrc.cnf"
+#line 496 "rrc.cnf"
 tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -117877,7 +117791,7 @@ dissect_rrc_ToTargetRNC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t
 
 static int
 dissect_rrc_T_dL_DCCHmessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 433 "rrc.cnf"
+#line 437 "rrc.cnf"
   tvbuff_t *dl_dcch_message_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -139435,10 +139349,6 @@ void proto_register_rrc(void) {
       { "timeslotISCP-List", "rrc.timeslotISCP_List",
         FT_UINT32, BASE_DEC, NULL, 0,
         "rrc.TimeslotISCP_List", HFILL }},
-    { &hf_rrc_cellMeasuredResults,
-      { "cellMeasuredResults", "rrc.cellMeasuredResults",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "rrc.CellMeasuredResults", HFILL }},
     { &hf_rrc_csgIdentity,
       { "csgIdentity", "rrc.csgIdentity",
         FT_BYTES, BASE_NONE, NULL, 0,
@@ -140331,14 +140241,6 @@ void proto_register_rrc(void) {
       { "dataBitAssistance", "rrc.dataBitAssistance",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrc.ReqDataBitAssistance", HFILL }},
-    { &hf_rrc_currentDecipheringKey,
-      { "currentDecipheringKey", "rrc.currentDecipheringKey",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "rrc.BIT_STRING_SIZE_56", HFILL }},
-    { &hf_rrc_nextDecipheringKey,
-      { "nextDecipheringKey", "rrc.nextDecipheringKey",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "rrc.BIT_STRING_SIZE_56", HFILL }},
     { &hf_rrc_ganssId,
       { "ganssId", "rrc.ganssId",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -141099,10 +141001,6 @@ void proto_register_rrc(void) {
       { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrc.GPS_TOW_Assist", HFILL }},
-    { &hf_rrc_gsm_CellID,
-      { "gsm-CellID", "rrc.gsm_CellID",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        "rrc.INTEGER_0_maxCellMeas_1", HFILL }},
     { &hf_rrc_gsmCellGroup,
       { "gsmCellGroup", "rrc.gsmCellGroup",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -141367,10 +141265,6 @@ void proto_register_rrc(void) {
       { "DeltaRSCPPerCell", "rrc.DeltaRSCPPerCell",
         FT_NONE, BASE_NONE, NULL, 0,
         "rrc.DeltaRSCPPerCell", HFILL }},
-    { &hf_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq_item,
-      { "CellMeasuredResultsListOnSecULFreq", "rrc.CellMeasuredResultsListOnSecULFreq",
-        FT_NONE, BASE_NONE, NULL, 0,
-        "rrc.CellMeasuredResultsListOnSecULFreq", HFILL }},
     { &hf_rrc_IntraFreqMeasuredResultsList_v9xyext_item,
       { "CellMeasuredResults-v9xyext", "rrc.CellMeasuredResults_v9xyext",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -154611,7 +154505,6 @@ void proto_register_rrc(void) {
     &ett_rrc_T_modeSpecificInfo_86,
     &ett_rrc_T_fdd_125,
     &ett_rrc_T_tdd_76,
-    &ett_rrc_CellMeasuredResultsListOnSecULFreq,
     &ett_rrc_CellMeasuredResults_v9xyext,
     &ett_rrc_CellMeasurementEventResults,
     &ett_rrc_SEQUENCE_SIZE_1_maxCellMeas_OF_PrimaryCPICH_Info,
@@ -154752,7 +154645,6 @@ void proto_register_rrc(void) {
     &ett_rrc_ForbiddenAffectCellList_r4,
     &ett_rrc_ForbiddenAffectCellList_LCR_r4,
     &ett_rrc_GanssDataBits,
-    &ett_rrc_GANSSDecipheringKeys,
     &ett_rrc_GANSSGenericData,
     &ett_rrc_GANSSGenericData_v860ext,
     &ett_rrc_GANSSGenericData_r8,
@@ -154812,7 +154704,6 @@ void proto_register_rrc(void) {
     &ett_rrc_GSM_MeasuredResultsList,
     &ett_rrc_GPS_TOW_Assist,
     &ett_rrc_GPS_TOW_AssistList,
-    &ett_rrc_GSM_CellID,
     &ett_rrc_GSM_PriorityInfo,
     &ett_rrc_GSM_PriorityInfoList,
     &ett_rrc_HCS_CellReselectInformation_RSCP,
@@ -154857,7 +154748,6 @@ void proto_register_rrc(void) {
     &ett_rrc_Inter_FreqEventCriteriaList_v590ext,
     &ett_rrc_Intra_FreqEventCriteriaList_v590ext,
     &ett_rrc_IntraFrequencyMeasuredResultsList_v590ext,
-    &ett_rrc_IntraFrequencyMeasuredResultsListOnSecULFreq,
     &ett_rrc_IntraFreqMeasuredResultsList_v9xyext,
     &ett_rrc_IntraFreqReportingCriteria_1b_r5,
     &ett_rrc_PeriodicReportingInfo_1b,
index 820195a6700e3dd9e1318b285e814b328cbaf20c..fe140ea1e72212d82596ac1ad9077d93dd733bce 100644 (file)
@@ -10,7 +10,7 @@
  * Routines for UMTS Home Node B RANAP User Adaptation (RUA) packet dissection
  * Copyright 2010 Neil Piercy, ip.access Limited <Neil.Piercy@ipaccess.com>
  *
- * $Id: asn1/rua/packet-rua-template.c 1.1 2010/02/24 11:03:43GMT Neil P Piercy (npp) Exp  $
+ * $Id: packet-rua-template.c 31988 2010-02-24 20:15:31Z etxrab $
  *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
@@ -266,7 +266,7 @@ dissect_rua_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, 255U, &ProcedureCode, FALSE);
 
-#line 52 "rua.cnf"
+#line 53 "rua.cnf"
      col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
                  val_to_str(ProcedureCode, rua_ProcedureCode_vals,
                             "unknown message"));
@@ -333,7 +333,7 @@ dissect_rua_ProtocolIE_ID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
   offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
                                                             0U, maxProtocolIEs, &ProtocolIE_ID, FALSE);
 
-#line 41 "rua.cnf"
+#line 42 "rua.cnf"
   if (tree) {
     proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(rua_ProtocolIE_ID_vals), "unknown (%d)"));
   }
@@ -399,15 +399,6 @@ dissect_rua_ProtocolIE_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *
 
 
 
-static int
-dissect_rua_ProtocolIE_Single_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_rua_ProtocolIE_Field(tvb, offset, actx, tree, hf_index);
-
-  return offset;
-}
-
-
-
 static int
 dissect_rua_T_extensionValue(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_ProtocolExtensionFieldExtensionValue);
@@ -816,7 +807,7 @@ dissect_rua_IntraDomainNasNodeSelector(tvbuff_t *tvb _U_, int offset _U_, asn1_c
 
 static int
 dissect_rua_RANAP_Message(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 64 "rua.cnf"
+#line 65 "rua.cnf"
   tvbuff_t *ranap_message_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
index 205d9a5e0b8bbd325fa40f09fb4bb518c28cc3ad..26bca2bb7950b2ae6dd6c98c30082d4ff2493d33 100644 (file)
@@ -596,8 +596,8 @@ static void unrecognized_token(void* tvbparse_data, const void* wanted_data _U_,
 
 
 static void init_xml_parser(void) {
-       tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
-       tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
+       tvbparse_wanted_t* want_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",NULL,NULL,NULL);
+       tvbparse_wanted_t* want_attr_name = tvbparse_chars(-1,1,0,"abcdefghijklmnopqrstuvwxyz.-_ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:",NULL,NULL,NULL);
 
        tvbparse_wanted_t* want_scoped_name = tvbparse_set_seq(XML_SCOPED_NAME, NULL, NULL, NULL,
                                                               want_name,