- Update to 3GPP TS 25.413 V9.4.0 (2010-09).

- Fill the value_strings.

svn path=/trunk/; revision=34929

diff --git a/asn1/pcap/PCAP-CommonDataTypes.asn b/asn1/pcap/PCAP-CommonDataTypes.asn
index 689ae83d2aec66ec527d5108e74a73251c5e8519..028997839d818bc5e31847f004a2951b83307dd0 100644 (file)
--- a/asn1/pcap/PCAP-CommonDataTypes.asn
+++ b/asn1/pcap/PCAP-CommonDataTypes.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
 --
 --9.3.5        Common Definitions
 -- **************************************************************

diff --git a/asn1/pcap/PCAP-Constants.asn b/asn1/pcap/PCAP-Constants.asn
index 4e91e9ac0c8e8dbed697b3ec146b4b2bcfabad1b..baa04d8304cb9e9057312964e6afd823f31403ec 100644 (file)
--- a/asn1/pcap/PCAP-Constants.asn
+++ b/asn1/pcap/PCAP-Constants.asn
@@ -109,12 +109,18 @@ id-RequestedDataValue                                                     ProtocolIE-ID ::= 15
 id-RequestedDataValueInformation                               ProtocolIE-ID ::= 16
 id-TransactionID                                                               ProtocolIE-ID ::= 17
 id-UE-PositionEstimate                                                 ProtocolIE-ID ::= 18
+-- WS extension
+id-Unknown-19                                                                  ProtocolIE-ID ::= 19
 id-CellId-MeasuredResultsSets                                  ProtocolIE-ID ::= 20
+-- WS extension
+id-Unknown-21                                                                  ProtocolIE-ID ::= 21
 id-OTDOA-MeasurementGroup                                              ProtocolIE-ID ::= 22
 id-AccuracyFulfilmentIndicator                                 ProtocolIE-ID ::= 23
 id-HorizontalAccuracyCode                                              ProtocolIE-ID ::= 24
 id-VerticalAccuracyCode                                                        ProtocolIE-ID ::= 25
 id-UTDOA-Group                                                                 ProtocolIE-ID ::= 26
+-- WS extension
+id-Unknown-27                                                                  ProtocolIE-ID ::= 27
 id-RequestType                                                                 ProtocolIE-ID ::= 28
 id-UE-PositioningCapability                                            ProtocolIE-ID ::= 29
 id-UC-id                                                                               ProtocolIE-ID ::= 30
@@ -139,6 +145,10 @@ id-UTRAN-GPS-DriftRate                                                     ProtocolIE-ID ::= 48
 id-OTDOA-AddMeasuredResultsInfo                                        ProtocolIE-ID ::= 49
 id-GPS-ReferenceLocation                                               ProtocolIE-ID ::= 50
 id-OTDOA-MeasuredResultsSets                                   ProtocolIE-ID ::= 51
+-- WS extension
+id-Unknown-52                                                                  ProtocolIE-ID ::= 52
+id-Unknown-53                                                                  ProtocolIE-ID ::= 53
+id-Unknown-54                                                                  ProtocolIE-ID ::= 54
 id-rxTimingDeviation384extInfo                                 ProtocolIE-ID ::= 55
 id-ExtendedRoundTripTime                                               ProtocolIE-ID ::= 56
 id-PeriodicPosCalcInfo                                                 ProtocolIE-ID ::= 57
@@ -149,6 +159,8 @@ id-RRCstateChange                                                           ProtocolIE-ID ::= 61
 id-PeriodicTerminationCause                                            ProtocolIE-ID ::= 62
 id-MeasurementValidity                                                 ProtocolIE-ID ::= 63
 id-roundTripTimeInfoWithType1                                  ProtocolIE-ID ::= 64
+-- WS extension
+id-Unknown-65                                                                  ProtocolIE-ID ::= 65
 id-CellIDPositioning                                                   ProtocolIE-ID ::= 66
 id-AddMeasurementInfo                                                  ProtocolIE-ID ::= 67
 id-Extended-RNC-ID                                                             ProtocolIE-ID ::= 68
@@ -156,7 +168,8 @@ id-GANSS-CommonAssistanceData                                       ProtocolIE-ID ::= 69
 id-GANSS-GenericAssistanceDataList                             ProtocolIE-ID ::= 70
 id-GANSS-MeasuredResultsList                                   ProtocolIE-ID ::= 71
 id-GANSS-UTRAN-TRU                                                             ProtocolIE-ID ::= 72
-id-GANSSPositioning                                                            ProtocolIE-ID ::= 73 id-GANSS-PositioningDataSet                                                ProtocolIE-ID ::= 74
+id-GANSSPositioning                                                            ProtocolIE-ID ::= 73 
+id-GANSS-PositioningDataSet                                            ProtocolIE-ID ::= 74
 id-GNSS-PositioningMethod                                              ProtocolIE-ID ::= 75
 id-NetworkAssistedGANSSSuport                                  ProtocolIE-ID ::= 76
 id-TUTRANGANSSMeasurementValueInfo                             ProtocolIE-ID ::= 77
@@ -167,7 +180,8 @@ id-extendedTimingAdvanceLCR                                         ProtocolIE-ID ::= 81
 id-additionalMeasurementInforLCR                               ProtocolIE-ID ::= 82
 id-timingAdvanceLCR-R7                                                 ProtocolIE-ID ::= 83
 id-rxTimingDeviationLCR                                                ProtocolIE-ID ::= 84
-id-GPSReferenceTimeUncertainty                                 ProtocolIE-ID ::= 85 id-GANSS-AddIonoModelReq                                           ProtocolIE-ID ::= 86
+id-GPSReferenceTimeUncertainty                                 ProtocolIE-ID ::= 85 
+id-GANSS-AddIonoModelReq                                               ProtocolIE-ID ::= 86
 id-GANSS-EarthOrientParaReq                                            ProtocolIE-ID ::= 87
 id-GANSS-Additional-Ionospheric-Model                  ProtocolIE-ID ::= 88
 id-GANSS-Earth-Orientation-Parameters                  ProtocolIE-ID ::= 89

diff --git a/asn1/pcap/PCAP-IEs.asn b/asn1/pcap/PCAP-IEs.asn
index b03aa42eba7a200ffb597ab1f18d68a2a2ea1b97..64e5bc6f73a686ba7c71b10a3cf0c045f5ad3eca 100644 (file)
--- a/asn1/pcap/PCAP-IEs.asn
+++ b/asn1/pcap/PCAP-IEs.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
 --
 -- 9.3.4       Information Element Definitions
 -- **************************************************************
@@ -1047,7 +1047,8 @@ DGANSS-SignalInformationItem ::= SEQUENCE {
        ...
 }
 
-DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {      {ID id-DGNSS-ValidityPeriod     CRITICALITY     ignore  EXTENSION       DGNSS-ValidityPeriod    PRESENCE        OPTIONAL},
+DGANSS-SignalInformationItem-ExtIEs PCAP-PROTOCOL-EXTENSION ::= {
+       {ID id-DGNSS-ValidityPeriod     CRITICALITY     ignore  EXTENSION       DGNSS-ValidityPeriod    PRESENCE        optional},
        ...
 }
 

diff --git a/asn1/pcap/PCAP-PDU-Contents.asn b/asn1/pcap/PCAP-PDU-Contents.asn
index ce0bec522e05d45ad1867498ce42f27c1cb98626..9210f59f180c4e8cc458deb29679b53eed648ab5 100644 (file)
--- a/asn1/pcap/PCAP-PDU-Contents.asn
+++ b/asn1/pcap/PCAP-PDU-Contents.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453  V9.1.0 (2010-03)
+-- 3GPP TS 25.453  V9.2.0 (2010-09)
 --
 --9.3.3        PDU Definitions
 -- **************************************************************
@@ -754,3 +754,4 @@ PositionPeriodicTermination-Extensions PCAP-PROTOCOL-EXTENSION ::= {
        ...
 }
 END
+

diff --git a/asn1/pcap/PCAP-PDU-Descriptions.asn b/asn1/pcap/PCAP-PDU-Descriptions.asn
index 4d48cb1c054599c42443edff3211303d40c99b6c..39313a19ba021b6ee571bb9256688d0fa0b632d9 100644 (file)
--- a/asn1/pcap/PCAP-PDU-Descriptions.asn
+++ b/asn1/pcap/PCAP-PDU-Descriptions.asn
@@ -1,6 +1,6 @@
 -- $Id$
 --
--- 3GPP TS 25.453 V9.1.0 (2010-03)
+-- 3GPP TS 25.453 V9.2.0 (2010-09)
 --
 -- 9.3.2       Elementary Procedure Definitions
 -- **************************************************************

diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf
index 3b1bca8d547b89774c72a225f5e2fe87a0d81380..5721b172cfc48dc35fd1c235b4fc286da1a8f35b 100644 (file)
--- a/asn1/pcap/pcap.cnf
+++ b/asn1/pcap/pcap.cnf
@@ -23,6 +23,10 @@ ProtocolIE-ID
 CauseRadioNetwork
 TDD-ChannelisationCode
 SFN-SFN-Drift
+CodePhaseSearchWindow
+TUTRAN-GANSS-DriftRate
+UTRAN-GPS-DriftRate
+ExplicitInformation
 
 #.NO_EMIT
 

diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index ffd5f14b2a8451ca2340b30c347a994a0147837b..ecd22589fb94cca3a9ac44b84a43e22b38cbf870 100644 (file)
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -134,7 +134,15 @@ id-HandoverType                                                            ProtocolIE-ID ::= 1
 id-Cause                                                                       ProtocolIE-ID ::= 2
 id-SourceID                                                                    ProtocolIE-ID ::= 3
 id-TargetID                                                                    ProtocolIE-ID ::= 4
+--WS extension
+id-Unknown-5                                                           ProtocolIE-ID ::= 5
+id-Unknown-6                                                           ProtocolIE-ID ::= 6
+id-Unknown-7                                                           ProtocolIE-ID ::= 7
 id-eNB-UE-S1AP-ID                                                      ProtocolIE-ID ::= 8
+--WS extension
+id-Unknown-9                                                           ProtocolIE-ID ::= 9
+id-Unknown-10                                                          ProtocolIE-ID ::= 10
+id-Unknown-11                                                          ProtocolIE-ID ::= 11
 id-E-RABSubjecttoDataForwardingList                    ProtocolIE-ID ::= 12
 id-E-RABtoReleaseListHOCmd                                     ProtocolIE-ID ::= 13
 id-E-RABDataForwardingItem                                     ProtocolIE-ID ::= 14
@@ -165,8 +173,12 @@ id-E-RABReleaseItem                                                        ProtocolIE-ID ::= 38
 id-E-RABSetupItemBearerSURes                           ProtocolIE-ID ::= 39
 id-SecurityContext                                                     ProtocolIE-ID ::= 40
 id-HandoverRestrictionList                                     ProtocolIE-ID ::= 41
+--WS extension
+id-Unknown-42                                                          ProtocolIE-ID ::= 42
 id-UEPagingID                                                          ProtocolIE-ID ::= 43
 id-pagingDRX                                                           ProtocolIE-ID ::= 44
+--WS extension
+id-Unknown-45                                                          ProtocolIE-ID ::= 45
 id-TAIList                                                                     ProtocolIE-ID ::= 46
 id-TAIItem                                                                     ProtocolIE-ID ::= 47
 id-E-RABFailedToSetupListCtxtSURes                     ProtocolIE-ID ::= 48
@@ -175,17 +187,25 @@ id-E-RABSetupItemCtxtSURes                                        ProtocolIE-ID ::= 50
 id-E-RABSetupListCtxtSURes                                     ProtocolIE-ID ::= 51
 id-E-RABToBeSetupItemCtxtSUReq                         ProtocolIE-ID ::= 52
 id-E-RABToBeSetupListHOReq                                     ProtocolIE-ID ::= 53
+--WS extension
+id-Unknown-54                                                                  ProtocolIE-ID ::= 54
 id-GERANtoLTEHOInformationRes                                  ProtocolIE-ID ::= 55
+--WS extension
+id-Unknown-56                                                                  ProtocolIE-ID ::= 56
 id-UTRANtoLTEHOInformationRes                                  ProtocolIE-ID ::= 57
 id-CriticalityDiagnostics                                              ProtocolIE-ID ::= 58
 id-Global-ENB-ID                                                               ProtocolIE-ID ::= 59
 id-eNBname                                                                             ProtocolIE-ID ::= 60
 id-MMEname                                                                             ProtocolIE-ID ::= 61
+--WS extension
+id-Unknown-62                                                                  ProtocolIE-ID ::= 62
 id-ServedPLMNs                                                                 ProtocolIE-ID ::= 63
 id-SupportedTAs                                                                        ProtocolIE-ID ::= 64
 id-TimeToWait                                                                  ProtocolIE-ID ::= 65
 id-uEaggregateMaximumBitrate                                   ProtocolIE-ID ::= 66
 id-TAI                                                                                 ProtocolIE-ID ::= 67
+--WS extension
+id-Unknown-68                                                                  ProtocolIE-ID ::= 68
 id-E-RABReleaseListBearerRelComp                               ProtocolIE-ID ::= 69
 id-cdma2000PDU                                                                 ProtocolIE-ID ::= 70
 id-cdma2000RATType                                                             ProtocolIE-ID ::= 71
@@ -193,11 +213,19 @@ id-cdma2000SectorID                                                               ProtocolIE-ID ::= 72
 id-SecurityKey                                                                 ProtocolIE-ID ::= 73
 id-UERadioCapability                                                   ProtocolIE-ID ::= 74
 id-GUMMEI-ID                                                                   ProtocolIE-ID ::= 75
+--WS extension
+id-Unknown-76                                                                  ProtocolIE-ID ::= 76
+id-Unknown-77                                                                  ProtocolIE-ID ::= 77
 id-E-RABInformationListItem                                            ProtocolIE-ID ::= 78
 id-Direct-Forwarding-Path-Availability                 ProtocolIE-ID ::= 79
 id-UEIdentityIndexValue                                                        ProtocolIE-ID ::= 80
+--WS extension
+id-Unknown-81                                                                  ProtocolIE-ID ::= 81
+id-Unknown-82                                                                  ProtocolIE-ID ::= 82
 id-cdma2000HOStatus                                                            ProtocolIE-ID ::= 83
 id-cdma2000HORequiredIndication                                        ProtocolIE-ID ::= 84
+--WS extension
+id-Unknown-85                                                                  ProtocolIE-ID ::= 85
 id-E-UTRAN-Trace-ID                                                            ProtocolIE-ID ::= 86
 id-RelativeMMECapacity                                                 ProtocolIE-ID ::= 87
 id-SourceMME-UE-S1AP-ID                                                        ProtocolIE-ID ::= 88

diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 3ac531b75c1925d3ba98b43d460f7fe03219d378..4c308b2d6b188f3ab28c0bf70df557ec8dc0d576 100644 (file)
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -142,12 +142,15 @@ typedef enum _ProtocolIE_ID_enum {
   id_RequestedDataValueInformation =  16,
   id_TransactionID =  17,
   id_UE_PositionEstimate =  18,
+  id_Unknown_19 =  19,
   id_CellId_MeasuredResultsSets =  20,
+  id_Unknown_21 =  21,
   id_OTDOA_MeasurementGroup =  22,
   id_AccuracyFulfilmentIndicator =  23,
   id_HorizontalAccuracyCode =  24,
   id_VerticalAccuracyCode =  25,
   id_UTDOA_Group =  26,
+  id_Unknown_27 =  27,
   id_RequestType =  28,
   id_UE_PositioningCapability =  29,
   id_UC_id     =  30,
@@ -172,6 +175,9 @@ typedef enum _ProtocolIE_ID_enum {
   id_OTDOA_AddMeasuredResultsInfo =  49,
   id_GPS_ReferenceLocation =  50,
   id_OTDOA_MeasuredResultsSets =  51,
+  id_Unknown_52 =  52,
+  id_Unknown_53 =  53,
+  id_Unknown_54 =  54,
   id_rxTimingDeviation384extInfo =  55,
   id_ExtendedRoundTripTime =  56,
   id_PeriodicPosCalcInfo =  57,
@@ -182,6 +188,7 @@ typedef enum _ProtocolIE_ID_enum {
   id_PeriodicTerminationCause =  62,
   id_MeasurementValidity =  63,
   id_roundTripTimeInfoWithType1 =  64,
+  id_Unknown_65 =  65,
   id_CellIDPositioning =  66,
   id_AddMeasurementInfo =  67,
   id_Extended_RNC_ID =  68,
@@ -1896,12 +1903,15 @@ static const value_string pcap_ProtocolIE_ID_vals[] = {
   { id_RequestedDataValueInformation, "id-RequestedDataValueInformation" },
   { id_TransactionID, "id-TransactionID" },
   { id_UE_PositionEstimate, "id-UE-PositionEstimate" },
+  { id_Unknown_19, "id-Unknown-19" },
   { id_CellId_MeasuredResultsSets, "id-CellId-MeasuredResultsSets" },
+  { id_Unknown_21, "id-Unknown-21" },
   { id_OTDOA_MeasurementGroup, "id-OTDOA-MeasurementGroup" },
   { id_AccuracyFulfilmentIndicator, "id-AccuracyFulfilmentIndicator" },
   { id_HorizontalAccuracyCode, "id-HorizontalAccuracyCode" },
   { id_VerticalAccuracyCode, "id-VerticalAccuracyCode" },
   { id_UTDOA_Group, "id-UTDOA-Group" },
+  { id_Unknown_27, "id-Unknown-27" },
   { id_RequestType, "id-RequestType" },
   { id_UE_PositioningCapability, "id-UE-PositioningCapability" },
   { id_UC_id, "id-UC-id" },
@@ -1926,6 +1936,9 @@ static const value_string pcap_ProtocolIE_ID_vals[] = {
   { id_OTDOA_AddMeasuredResultsInfo, "id-OTDOA-AddMeasuredResultsInfo" },
   { id_GPS_ReferenceLocation, "id-GPS-ReferenceLocation" },
   { id_OTDOA_MeasuredResultsSets, "id-OTDOA-MeasuredResultsSets" },
+  { id_Unknown_52, "id-Unknown-52" },
+  { id_Unknown_53, "id-Unknown-53" },
+  { id_Unknown_54, "id-Unknown-54" },
   { id_rxTimingDeviation384extInfo, "id-rxTimingDeviation384extInfo" },
   { id_ExtendedRoundTripTime, "id-ExtendedRoundTripTime" },
   { id_PeriodicPosCalcInfo, "id-PeriodicPosCalcInfo" },
@@ -1936,6 +1949,7 @@ static const value_string pcap_ProtocolIE_ID_vals[] = {
   { id_PeriodicTerminationCause, "id-PeriodicTerminationCause" },
   { id_MeasurementValidity, "id-MeasurementValidity" },
   { id_roundTripTimeInfoWithType1, "id-roundTripTimeInfoWithType1" },
+  { id_Unknown_65, "id-Unknown-65" },
   { id_CellIDPositioning, "id-CellIDPositioning" },
   { id_AddMeasurementInfo, "id-AddMeasurementInfo" },
   { id_Extended_RNC_ID, "id-Extended-RNC-ID" },
@@ -4030,6 +4044,8 @@ static const value_string pcap_CodePhaseSearchWindow_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext pcap_CodePhaseSearchWindow_vals_ext = VALUE_STRING_EXT_INIT(pcap_CodePhaseSearchWindow_vals);
+
 
 static int
 dissect_pcap_CodePhaseSearchWindow(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -5638,6 +5654,8 @@ static const value_string pcap_TUTRAN_GANSS_DriftRate_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext pcap_TUTRAN_GANSS_DriftRate_vals_ext = VALUE_STRING_EXT_INIT(pcap_TUTRAN_GANSS_DriftRate_vals);
+
 
 static int
 dissect_pcap_TUTRAN_GANSS_DriftRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -6837,6 +6855,8 @@ static const value_string pcap_UTRAN_GPS_DriftRate_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext pcap_UTRAN_GPS_DriftRate_vals_ext = VALUE_STRING_EXT_INIT(pcap_UTRAN_GPS_DriftRate_vals);
+
 
 static int
 dissect_pcap_UTRAN_GPS_DriftRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -7804,6 +7824,8 @@ static const value_string pcap_ExplicitInformation_vals[] = {
   { 0, NULL }
 };
 
+static value_string_ext pcap_ExplicitInformation_vals_ext = VALUE_STRING_EXT_INIT(pcap_ExplicitInformation_vals);
+
 static const per_choice_t ExplicitInformation_choice[] = {
   {   0, &hf_pcap_almanacAndSatelliteHealth, ASN1_EXTENSION_ROOT    , dissect_pcap_AlmanacAndSatelliteHealth },
   {   1, &hf_pcap_utcModel       , ASN1_EXTENSION_ROOT    , dissect_pcap_UtcModel },
@@ -13522,7 +13544,7 @@ void proto_register_pcap(void) {
         NULL, HFILL }},
     { &hf_pcap_UTRAN_GPS_DriftRate_PDU,
       { "UTRAN-GPS-DriftRate", "pcap.UTRAN_GPS_DriftRate",
-        FT_UINT32, BASE_DEC, VALS(pcap_UTRAN_GPS_DriftRate_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_UTRAN_GPS_DriftRate_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_GPSReferenceTimeUncertainty_PDU,
       { "GPSReferenceTimeUncertainty", "pcap.GPSReferenceTimeUncertainty",
@@ -14394,7 +14416,7 @@ void proto_register_pcap(void) {
         "INTEGER_0_3", HFILL }},
     { &hf_pcap_codePhaseSearchWindow,
       { "codePhaseSearchWindow", "pcap.codePhaseSearchWindow",
-        FT_UINT32, BASE_DEC, VALS(pcap_CodePhaseSearchWindow_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_CodePhaseSearchWindow_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_azimuthAndElevation,
       { "azimuthAndElevation", "pcap.azimuthAndElevation",
@@ -15038,7 +15060,7 @@ void proto_register_pcap(void) {
         "UTRAN_GANSSReferenceTimeDL", HFILL }},
     { &hf_pcap_tutran_ganss_driftRate,
       { "tutran-ganss-driftRate", "pcap.tutran_ganss_driftRate",
-        FT_UINT32, BASE_DEC, VALS(pcap_TUTRAN_GANSS_DriftRate_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_TUTRAN_GANSS_DriftRate_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_gANSS_tod,
       { "gANSS-tod", "pcap.gANSS_tod",
@@ -16362,7 +16384,7 @@ void proto_register_pcap(void) {
         "ExplicitInformationList", HFILL }},
     { &hf_pcap_ExplicitInformationList_item,
       { "ExplicitInformation", "pcap.ExplicitInformation",
-        FT_UINT32, BASE_DEC, VALS(pcap_ExplicitInformation_vals), 0,
+        FT_UINT32, BASE_DEC|BASE_EXT_STRING, &pcap_ExplicitInformation_vals_ext, 0,
         NULL, HFILL }},
     { &hf_pcap_almanacAndSatelliteHealth,
       { "almanacAndSatelliteHealth", "pcap.almanacAndSatelliteHealth",

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 1d94d038eccd2896d87273b97011c395a8a834ac..1c09fbc55aef3f3d38c2b8d139b94cc8e3583c78 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -154,7 +154,13 @@ typedef enum _ProtocolIE_ID_enum {
   id_Cause     =   2,
   id_SourceID  =   3,
   id_TargetID  =   4,
+  id_Unknown_5 =   5,
+  id_Unknown_6 =   6,
+  id_Unknown_7 =   7,
   id_eNB_UE_S1AP_ID =   8,
+  id_Unknown_9 =   9,
+  id_Unknown_10 =  10,
+  id_Unknown_11 =  11,
   id_E_RABSubjecttoDataForwardingList =  12,
   id_E_RABtoReleaseListHOCmd =  13,
   id_E_RABDataForwardingItem =  14,
@@ -185,8 +191,10 @@ typedef enum _ProtocolIE_ID_enum {
   id_E_RABSetupItemBearerSURes =  39,
   id_SecurityContext =  40,
   id_HandoverRestrictionList =  41,
+  id_Unknown_42 =  42,
   id_UEPagingID =  43,
   id_pagingDRX =  44,
+  id_Unknown_45 =  45,
   id_TAIList   =  46,
   id_TAIItem   =  47,
   id_E_RABFailedToSetupListCtxtSURes =  48,
@@ -195,17 +203,21 @@ typedef enum _ProtocolIE_ID_enum {
   id_E_RABSetupListCtxtSURes =  51,
   id_E_RABToBeSetupItemCtxtSUReq =  52,
   id_E_RABToBeSetupListHOReq =  53,
+  id_Unknown_54 =  54,
   id_GERANtoLTEHOInformationRes =  55,
+  id_Unknown_56 =  56,
   id_UTRANtoLTEHOInformationRes =  57,
   id_CriticalityDiagnostics =  58,
   id_Global_ENB_ID =  59,
   id_eNBname   =  60,
   id_MMEname   =  61,
+  id_Unknown_62 =  62,
   id_ServedPLMNs =  63,
   id_SupportedTAs =  64,
   id_TimeToWait =  65,
   id_uEaggregateMaximumBitrate =  66,
   id_TAI       =  67,
+  id_Unknown_68 =  68,
   id_E_RABReleaseListBearerRelComp =  69,
   id_cdma2000PDU =  70,
   id_cdma2000RATType =  71,
@@ -213,11 +225,16 @@ typedef enum _ProtocolIE_ID_enum {
   id_SecurityKey =  73,
   id_UERadioCapability =  74,
   id_GUMMEI_ID =  75,
+  id_Unknown_76 =  76,
+  id_Unknown_77 =  77,
   id_E_RABInformationListItem =  78,
   id_Direct_Forwarding_Path_Availability =  79,
   id_UEIdentityIndexValue =  80,
+  id_Unknown_81 =  81,
+  id_Unknown_82 =  82,
   id_cdma2000HOStatus =  83,
   id_cdma2000HORequiredIndication =  84,
+  id_Unknown_85 =  85,
   id_E_UTRAN_Trace_ID =  86,
   id_RelativeMMECapacity =  87,
   id_SourceMME_UE_S1AP_ID =  88,
@@ -1106,7 +1123,13 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_Cause, "id-Cause" },
   { id_SourceID, "id-SourceID" },
   { id_TargetID, "id-TargetID" },
+  { id_Unknown_5, "id-Unknown-5" },
+  { id_Unknown_6, "id-Unknown-6" },
+  { id_Unknown_7, "id-Unknown-7" },
   { id_eNB_UE_S1AP_ID, "id-eNB-UE-S1AP-ID" },
+  { id_Unknown_9, "id-Unknown-9" },
+  { id_Unknown_10, "id-Unknown-10" },
+  { id_Unknown_11, "id-Unknown-11" },
   { id_E_RABSubjecttoDataForwardingList, "id-E-RABSubjecttoDataForwardingList" },
   { id_E_RABtoReleaseListHOCmd, "id-E-RABtoReleaseListHOCmd" },
   { id_E_RABDataForwardingItem, "id-E-RABDataForwardingItem" },
@@ -1137,8 +1160,10 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_E_RABSetupItemBearerSURes, "id-E-RABSetupItemBearerSURes" },
   { id_SecurityContext, "id-SecurityContext" },
   { id_HandoverRestrictionList, "id-HandoverRestrictionList" },
+  { id_Unknown_42, "id-Unknown-42" },
   { id_UEPagingID, "id-UEPagingID" },
   { id_pagingDRX, "id-pagingDRX" },
+  { id_Unknown_45, "id-Unknown-45" },
   { id_TAIList, "id-TAIList" },
   { id_TAIItem, "id-TAIItem" },
   { id_E_RABFailedToSetupListCtxtSURes, "id-E-RABFailedToSetupListCtxtSURes" },
@@ -1147,17 +1172,21 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_E_RABSetupListCtxtSURes, "id-E-RABSetupListCtxtSURes" },
   { id_E_RABToBeSetupItemCtxtSUReq, "id-E-RABToBeSetupItemCtxtSUReq" },
   { id_E_RABToBeSetupListHOReq, "id-E-RABToBeSetupListHOReq" },
+  { id_Unknown_54, "id-Unknown-54" },
   { id_GERANtoLTEHOInformationRes, "id-GERANtoLTEHOInformationRes" },
+  { id_Unknown_56, "id-Unknown-56" },
   { id_UTRANtoLTEHOInformationRes, "id-UTRANtoLTEHOInformationRes" },
   { id_CriticalityDiagnostics, "id-CriticalityDiagnostics" },
   { id_Global_ENB_ID, "id-Global-ENB-ID" },
   { id_eNBname, "id-eNBname" },
   { id_MMEname, "id-MMEname" },
+  { id_Unknown_62, "id-Unknown-62" },
   { id_ServedPLMNs, "id-ServedPLMNs" },
   { id_SupportedTAs, "id-SupportedTAs" },
   { id_TimeToWait, "id-TimeToWait" },
   { id_uEaggregateMaximumBitrate, "id-uEaggregateMaximumBitrate" },
   { id_TAI, "id-TAI" },
+  { id_Unknown_68, "id-Unknown-68" },
   { id_E_RABReleaseListBearerRelComp, "id-E-RABReleaseListBearerRelComp" },
   { id_cdma2000PDU, "id-cdma2000PDU" },
   { id_cdma2000RATType, "id-cdma2000RATType" },
@@ -1165,11 +1194,16 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_SecurityKey, "id-SecurityKey" },
   { id_UERadioCapability, "id-UERadioCapability" },
   { id_GUMMEI_ID, "id-GUMMEI-ID" },
+  { id_Unknown_76, "id-Unknown-76" },
+  { id_Unknown_77, "id-Unknown-77" },
   { id_E_RABInformationListItem, "id-E-RABInformationListItem" },
   { id_Direct_Forwarding_Path_Availability, "id-Direct-Forwarding-Path-Availability" },
   { id_UEIdentityIndexValue, "id-UEIdentityIndexValue" },
+  { id_Unknown_81, "id-Unknown-81" },
+  { id_Unknown_82, "id-Unknown-82" },
   { id_cdma2000HOStatus, "id-cdma2000HOStatus" },
   { id_cdma2000HORequiredIndication, "id-cdma2000HORequiredIndication" },
+  { id_Unknown_85, "id-Unknown-85" },
   { id_E_UTRAN_Trace_ID, "id-E-UTRAN-Trace-ID" },
   { id_RelativeMMECapacity, "id-RelativeMMECapacity" },
   { id_SourceMME_UE_S1AP_ID, "id-SourceMME-UE-S1AP-ID" },