Update to V9.3.0 (2010-06)

Export ENB-StatusTransfer-TransparentContainer

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

diff --git a/asn1/s1ap/S1AP-CommonDataTypes.asn b/asn1/s1ap/S1AP-CommonDataTypes.asn
index b475a8621e84d83551aa300ffc12db6819521b8f..6d3cbe768842d803025d3f0bb30b711804a18fd7 100644 (file)
--- a/asn1/s1ap/S1AP-CommonDataTypes.asn
+++ b/asn1/s1ap/S1AP-CommonDataTypes.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.2.0 (2010-03)
+-- 3GPP TS 36.413 V9.3.0 (2010-06)
 -- 9.3.5       Common Definitions
 -- **************************************************************
 --

diff --git a/asn1/s1ap/S1AP-Constants.asn b/asn1/s1ap/S1AP-Constants.asn
index dbcabcbb9e9816610549dada0cd687182ef27f59..9596c49f424429fd5c2374d483bb086e37793a21 100644 (file)
--- a/asn1/s1ap/S1AP-Constants.asn
+++ b/asn1/s1ap/S1AP-Constants.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.2.0 (2010-03)
+-- 3GPP TS 36.413 V9.3.0 (2010-06)
 -- 9.3.6       Constant Definitions
 -- **************************************************************
 --
@@ -262,5 +262,6 @@ id-CSGMembershipStatus                                                      ProtocolIE-ID ::= 146
 id-LPPa-PDU                                                                            ProtocolIE-ID ::= 147
 id-Routing-ID                                                                  ProtocolIE-ID ::= 148
 id-Time-Synchronization-Info                                   ProtocolIE-ID ::= 149
+id-PS-ServiceNotAvailable                                              ProtocolIE-ID ::= 150
 
 END

diff --git a/asn1/s1ap/S1AP-IEs.asn b/asn1/s1ap/S1AP-IEs.asn
index 561b15029c4b19dde87f9f72545ce7e5f41345cc..f8b95c8a4c8fbcbbe92e4434e2eef26e25ed8894 100644 (file)
--- a/asn1/s1ap/S1AP-IEs.asn
+++ b/asn1/s1ap/S1AP-IEs.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.2.0 (2010-03)
+-- 3GPP TS 36.413 V9.3.0 (2010-06)
 -- 9.3.4       Information Element Definitions
 -- **************************************************************
 --
@@ -603,7 +603,10 @@ ForbiddenInterRATs ::= ENUMERATED {
        geran,
        utran,
        cdma2000,
-       ...
+       ...,
+       geranandutran,
+       cdma2000andutran
+
 }
 
 ForbiddenTAs ::= SEQUENCE (SIZE(1.. maxnoofEPLMNsPlusOne)) OF ForbiddenTAs-Item
@@ -818,6 +821,10 @@ Pre-emptionVulnerability ::= ENUMERATED {
 
 PriorityLevel                          ::= INTEGER { spare (0), highest (1), lowest (14), no-priority (15) } (0..15)
 
+PS-ServiceNotAvailable ::= ENUMERATED {
+       ps-service-not-available,
+       ...
+}
 
 -- Q
 

diff --git a/asn1/s1ap/S1AP-PDU-Contents.asn b/asn1/s1ap/S1AP-PDU-Contents.asn
index 3876538c4b0e4f2ffd67718e0912b42a8b165239..9cb9615012ac68f0a175350bb637cf45024d65b3 100644 (file)
--- a/asn1/s1ap/S1AP-PDU-Contents.asn
+++ b/asn1/s1ap/S1AP-PDU-Contents.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.2.0 (2010-03)
+-- 3GPP TS 36.413 V9.3.0 (2010-06)
 -- 9.3.3       PDU Definitions
 -- **************************************************************
 --
@@ -111,7 +111,8 @@ Routing-ID,
        WarningMessageContents,
        BroadcastCompletedAreaList,
        RRC-Establishment-Cause,
-       BroadcastCancelledAreaList
+       BroadcastCancelledAreaList,
+       PS-ServiceNotAvailable
 
 FROM S1AP-IEs
 
@@ -267,7 +268,8 @@ FROM S1AP-Containers
        maxnoofTAIforWarning,
        maxnoofCellinTAI,
        maxnoofCellinEAI,
-       id-ExtendedRepetitionPeriod
+       id-ExtendedRepetitionPeriod,
+       id-PS-ServiceNotAvailable
 
 
 FROM S1AP-Constants;
@@ -300,19 +302,20 @@ HandoverRequired ::= SEQUENCE {
 }
 
 HandoverRequiredIEs S1AP-PROTOCOL-IES ::= {    
-       { ID id-MME-UE-S1AP-ID                                                  CRITICALITY reject      TYPE MME-UE-S1AP-ID                                                                     PRESENCE mandatory      } |
-       { ID id-eNB-UE-S1AP-ID                                                  CRITICALITY reject      TYPE ENB-UE-S1AP-ID                                                                     PRESENCE mandatory      } |
-       { ID id-HandoverType                                                    CRITICALITY reject      TYPE HandoverType                                                                       PRESENCE mandatory      } |
-       { ID id-Cause                                                                   CRITICALITY ignore      TYPE Cause                                                                                      PRESENCE mandatory      } |
-       { ID id-TargetID                                                                CRITICALITY reject      TYPE TargetID                                                                           PRESENCE mandatory      } |
-       { ID id-Direct-Forwarding-Path-Availability             CRITICALITY ignore      TYPE Direct-Forwarding-Path-Availability                PRESENCE optional } |
-       { ID id-SRVCCHOIndication                                               CRITICALITY reject      TYPE    SRVCCHOIndication                                                       PRESENCE optional }|
-       { ID id-Source-ToTarget-TransparentContainer    CRITICALITY reject      TYPE Source-ToTarget-TransparentContainer       PRESENCE mandatory }|
-       { ID id-Source-ToTarget-TransparentContainer-Secondary  CRITICALITY reject      TYPE Source-ToTarget-TransparentContainer       PRESENCE optional }|
-       { ID id-MSClassmark2                                                    CRITICALITY reject      TYPE MSClassmark2                                                                       PRESENCE  conditional }|
-       { ID id-MSClassmark3                                                    CRITICALITY ignore      TYPE MSClassmark3                                                                       PRESENCE conditional } |
-       { ID id-CSG-Id                                                                  CRITICALITY reject      TYPE CSG-Id                                                                                     PRESENCE optional} |
-       { ID id-CellAccessMode                                                  CRITICALITY reject      TYPE CellAccessMode                                                                     PRESENCE optional},
+       { ID id-MME-UE-S1AP-ID                                                  CRITICALITY reject      TYPE MME-UE-S1AP-ID                                                                     PRESENCE mandatory }|
+       { ID id-eNB-UE-S1AP-ID                                                  CRITICALITY reject      TYPE ENB-UE-S1AP-ID                                                                     PRESENCE mandatory }|
+       { ID id-HandoverType                                                    CRITICALITY reject      TYPE HandoverType                                                                       PRESENCE mandatory }|
+       { ID id-Cause                                                                   CRITICALITY ignore      TYPE Cause                                                                                      PRESENCE mandatory }|
+       { ID id-TargetID                                                                CRITICALITY reject      TYPE TargetID                                                                           PRESENCE mandatory }|
+       { ID id-Direct-Forwarding-Path-Availability             CRITICALITY ignore      TYPE Direct-Forwarding-Path-Availability                PRESENCE optional }|
+       { ID id-SRVCCHOIndication                                               CRITICALITY reject      TYPE SRVCCHOIndication                                                          PRESENCE optional }|
+       { ID id-Source-ToTarget-TransparentContainer    CRITICALITY reject      TYPE Source-ToTarget-TransparentContainer       PRESENCE mandatory }|
+       { ID id-Source-ToTarget-TransparentContainer-Secondary  CRITICALITY reject      TYPE Source-ToTarget-TransparentContainer       PRESENCE optional }|
+       { ID id-MSClassmark2                                                    CRITICALITY reject      TYPE MSClassmark2                                                                       PRESENCE conditional }|
+       { ID id-MSClassmark3                                                    CRITICALITY ignore      TYPE MSClassmark3                                                                       PRESENCE conditional }|
+       { ID id-CSG-Id                                                                  CRITICALITY reject      TYPE CSG-Id                                                                                     PRESENCE optional }|
+       { ID id-CellAccessMode                                                  CRITICALITY reject      TYPE CellAccessMode                                                                     PRESENCE optional }|
+       { ID id-PS-ServiceNotAvailable                                  CRITICALITY ignore      TYPE PS-ServiceNotAvailable                                             PRESENCE optional },
        ...
 }
 

diff --git a/asn1/s1ap/S1AP-PDU-Descriptions.asn b/asn1/s1ap/S1AP-PDU-Descriptions.asn
index 615f7b079d22ca699eee3ae125de144bfdccf412..9a58cf689101ed46d345e59f9c538f716f18ded4 100644 (file)
--- a/asn1/s1ap/S1AP-PDU-Descriptions.asn
+++ b/asn1/s1ap/S1AP-PDU-Descriptions.asn
@@ -1,5 +1,5 @@
 -- $Id$
--- 3GPP TS 36.413 V9.2.0 (2010-03)
+-- 3GPP TS 36.413 V9.3.0 (2010-06)
 -- 9.3.2       Elementary Procedure Definitions
 -- **************************************************************
 --

diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf
index d93e58adaa94de6d57cbd30396ed13446287b623..2d8c0a9352edb57d2b54e72b1ea4025062ff0450 100644 (file)
--- a/asn1/s1ap/s1ap.cnf
+++ b/asn1/s1ap/s1ap.cnf
@@ -15,6 +15,9 @@ CauseNas
 CauseProtocol
 CauseMisc
 
+#.EXPORTS
+ENB-StatusTransfer-TransparentContainer_PDU
+
 #.PDU_NEW
 S1AP-PDU
 SourceeNB-ToTargeteNB-TransparentContainer
@@ -23,6 +26,7 @@ SourceRNC-ToTargetRNC-TransparentContainer
 TargetRNC-ToSourceRNC-TransparentContainer
 SourceBSS-ToTargetBSS-TransparentContainer
 TargetBSS-ToSourceBSS-TransparentContainer
+ENB-StatusTransfer-TransparentContainer
 
 #.MAKE_ENUM
 ProcedureCode
@@ -619,6 +623,7 @@ id-CSGMembershipStatus                                                              ProtocolIE-ID
 id-LPPa-PDU                                                                                    ProtocolIE-ID
 id-Routing-ID                                                                          ProtocolIE-ID
 id-Time-Synchronization-Info                                           ProtocolIE-ID
+id-PS-ServiceNotAvailable                                                      ProtocolIE-ID
 #.END
 
 #.REGISTER_NEW
@@ -751,6 +756,7 @@ CellAccessMode                                                      N s1ap.ies id-CellAccessMode
 CSGMembershipStatus                                            N s1ap.ies id-CSGMembershipStatus
 LPPa-PDU                                                               N s1ap.ies id-LPPa-PDU
 Routing-ID                                                             N s1ap.ies id-Routing-ID
+PS-ServiceNotAvailable                                 N s1ap.ies id-PS-ServiceNotAvailable
 
 #S1AP-PROTOCOL-IES-PAIR
 #RAB-SetupOrModifyItemFirst                            N s1ap.ies.pair.first id-RAB-SetupOrModifyItem

diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 1dc0739c534119467944204e6343248b9049bdbb..32a0a1b6f6f7b3b277dcd0db4d360803ac6399af 100644 (file)
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -281,7 +281,8 @@ typedef enum _ProtocolIE_ID_enum {
   id_CSGMembershipStatus = 146,
   id_LPPa_PDU  = 147,
   id_Routing_ID = 148,
-  id_Time_Synchronization_Info = 149
+  id_Time_Synchronization_Info = 149,
+  id_PS_ServiceNotAvailable = 150
 } ProtocolIE_ID_enum;
 
 /*--- End of included file: packet-s1ap-val.h ---*/
@@ -318,7 +319,7 @@ static int hf_s1ap_DataCodingScheme_PDU = -1;     /* DataCodingScheme */
 static int hf_s1ap_Direct_Forwarding_Path_Availability_PDU = -1;  /* Direct_Forwarding_Path_Availability */
 static int hf_s1ap_Data_Forwarding_Not_Possible_PDU = -1;  /* Data_Forwarding_Not_Possible */
 static int hf_s1ap_Global_ENB_ID_PDU = -1;        /* Global_ENB_ID */
-static int hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU = -1;  /* ENB_StatusTransfer_TransparentContainer */
+static int hf_s1ap_s1ap_ENB_StatusTransfer_TransparentContainer_PDU = -1;  /* ENB_StatusTransfer_TransparentContainer */
 static int hf_s1ap_ENB_UE_S1AP_ID_PDU = -1;       /* ENB_UE_S1AP_ID */
 static int hf_s1ap_ENBname_PDU = -1;              /* ENBname */
 static int hf_s1ap_E_RABInformationListItem_PDU = -1;  /* E_RABInformationListItem */
@@ -342,6 +343,7 @@ static int hf_s1ap_NASSecurityParameterstoE_UTRAN_PDU = -1;  /* NASSecurityParam
 static int hf_s1ap_NumberofBroadcastRequest_PDU = -1;  /* NumberofBroadcastRequest */
 static int hf_s1ap_OverloadResponse_PDU = -1;     /* OverloadResponse */
 static int hf_s1ap_PagingDRX_PDU = -1;            /* PagingDRX */
+static int hf_s1ap_PS_ServiceNotAvailable_PDU = -1;  /* PS_ServiceNotAvailable */
 static int hf_s1ap_RelativeMMECapacity_PDU = -1;  /* RelativeMMECapacity */
 static int hf_s1ap_RequestType_PDU = -1;          /* RequestType */
 static int hf_s1ap_RepetitionPeriod_PDU = -1;     /* RepetitionPeriod */
@@ -1077,7 +1079,7 @@ dissect_s1ap_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 85 "s1ap.cnf"
+#line 89 "s1ap.cnf"
      col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
                  val_to_str(ProcedureCode, s1ap_ProcedureCode_vals,
                             "unknown message"));
@@ -1230,6 +1232,7 @@ static const value_string s1ap_ProtocolIE_ID_vals[] = {
   { id_LPPa_PDU, "id-LPPa-PDU" },
   { id_Routing_ID, "id-Routing-ID" },
   { id_Time_Synchronization_Info, "id-Time-Synchronization-Info" },
+  { id_PS_ServiceNotAvailable, "id-PS-ServiceNotAvailable" },
   { 0, NULL }
 };
 
@@ -1239,7 +1242,7 @@ dissect_s1ap_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, 65535U, &ProtocolIE_ID, FALSE);
 
-#line 68 "s1ap.cnf"
+#line 72 "s1ap.cnf"
   if (tree) {
     proto_item_append_text(proto_item_get_parent_nth(actx->created_item, 2), ": %s", val_to_str(ProtocolIE_ID, VALS(s1ap_ProtocolIE_ID_vals), "unknown (%d)"));
   }
@@ -1319,7 +1322,7 @@ static const per_sequence_t ProtocolIE_ContainerList_sequence_of[1] = {
 
 static int
 dissect_s1ap_ProtocolIE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 110 "s1ap.cnf"
+#line 114 "s1ap.cnf"
   static const asn1_par_def_t ProtocolIE_ContainerList_pars[] = {
     { "lowerBound", ASN1_PAR_INTEGER },
     { "upperBound", ASN1_PAR_INTEGER },
@@ -1582,7 +1585,7 @@ dissect_s1ap_BitRate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 
 static int
 dissect_s1ap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 172 "s1ap.cnf"
+#line 176 "s1ap.cnf"
   tvbuff_t *parameter_tvb=NULL;
 
   offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index,
@@ -2786,7 +2789,7 @@ dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr
 
 static int
 dissect_s1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 194 "s1ap.cnf"
+#line 198 "s1ap.cnf"
   tvbuff_t *parameter_tvb=NULL;
   proto_tree *subtree;
   gint tvb_len;
@@ -3009,6 +3012,8 @@ static const value_string s1ap_ForbiddenInterRATs_vals[] = {
   {   1, "geran" },
   {   2, "utran" },
   {   3, "cdma2000" },
+  {   4, "geranandutran" },
+  {   5, "cdma2000andutran" },
   { 0, NULL }
 };
 
@@ -3016,7 +3021,7 @@ static const value_string s1ap_ForbiddenInterRATs_vals[] = {
 static int
 dissect_s1ap_ForbiddenInterRATs(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,
-                                     4, NULL, TRUE, 0, NULL);
+                                     4, NULL, TRUE, 2, NULL);
 
   return offset;
 }
@@ -3188,7 +3193,7 @@ static const value_string s1ap_HandoverType_vals[] = {
 
 static int
 dissect_s1ap_HandoverType(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 229 "s1ap.cnf"
+#line 233 "s1ap.cnf"
 
   offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
                                      5, &handover_type_value, TRUE, 0, NULL);
@@ -3393,7 +3398,7 @@ dissect_s1ap_MSClassmark3(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U
 
 static int
 dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 185 "s1ap.cnf"
+#line 189 "s1ap.cnf"
 
   tvbuff_t *parameter_tvb=NULL;
   
@@ -3495,6 +3500,21 @@ dissect_s1ap_PagingDRX(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
+static const value_string s1ap_PS_ServiceNotAvailable_vals[] = {
+  {   0, "ps-service-not-available" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_s1ap_PS_ServiceNotAvailable(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,
+                                     1, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 
 static int
 dissect_s1ap_RelativeMMECapacity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
@@ -3625,7 +3645,7 @@ dissect_s1ap_RepetitionPeriod(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act
 
 static int
 dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 359 "s1ap.cnf"
+#line 363 "s1ap.cnf"
 
 
  gint32 start_offset;
@@ -3858,7 +3878,7 @@ dissect_s1ap_SONConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ct
 
 static int
 dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 248 "s1ap.cnf"
+#line 252 "s1ap.cnf"
  gint32 start_offset;
  tvbuff_t *parameter_tvb;
  proto_tree *subtree;
@@ -4229,7 +4249,7 @@ dissect_s1ap_TargeteNB_ToSourceeNB_TransparentContainer(tvbuff_t *tvb _U_, int o
 
 static int
 dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 302 "s1ap.cnf"
+#line 306 "s1ap.cnf"
 
  gint32 start_offset;
  tvbuff_t *parameter_tvb;
@@ -4483,7 +4503,7 @@ dissect_s1ap_UEPagingID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 
 static int
 dissect_s1ap_UERadioCapability(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 419 "s1ap.cnf"
+#line 423 "s1ap.cnf"
 
  gint32 start_offset;
  tvbuff_t *parameter_tvb;
@@ -4579,7 +4599,7 @@ dissect_s1ap_WarningMessageContents(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
 
 static int
 dissect_s1ap_E_RAB_IE_ContainerList(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 137 "s1ap.cnf"
+#line 141 "s1ap.cnf"
   asn1_stack_frame_push(actx, "ProtocolIE-ContainerList");
   asn1_param_push_integer(actx, 1);
   asn1_param_push_integer(actx, maxNrOfE_RABs);
@@ -4599,7 +4619,7 @@ static const per_sequence_t HandoverRequired_sequence[] = {
 
 static int
 dissect_s1ap_HandoverRequired(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 234 "s1ap.cnf"
+#line 238 "s1ap.cnf"
        handover_type_value = 0;
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -4616,7 +4636,7 @@ static const per_sequence_t HandoverCommand_sequence[] = {
 
 static int
 dissect_s1ap_HandoverCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 236 "s1ap.cnf"
+#line 240 "s1ap.cnf"
        handover_type_value = 0;
 
   offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index,
@@ -4675,7 +4695,7 @@ static const per_sequence_t HandoverRequest_sequence[] = {
 
 static int
 dissect_s1ap_HandoverRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 238 "s1ap.cnf"
+#line 242 "s1ap.cnf"
        handover_type_value = 0;
        
 
@@ -5423,7 +5443,7 @@ static const per_sequence_t DownlinkNASTransport_sequence[] = {
 
 static int
 dissect_s1ap_DownlinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 221 "s1ap.cnf"
+#line 225 "s1ap.cnf"
        /* Set the direction of the message */
        actx->pinfo->link_dir=P2P_DIR_DL;
 
@@ -5442,7 +5462,7 @@ static const per_sequence_t InitialUEMessage_sequence[] = {
 
 static int
 dissect_s1ap_InitialUEMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 217 "s1ap.cnf"
+#line 221 "s1ap.cnf"
        /* Set the direction of the message */
        actx->pinfo->link_dir=P2P_DIR_UL;
 
@@ -5461,7 +5481,7 @@ static const per_sequence_t UplinkNASTransport_sequence[] = {
 
 static int
 dissect_s1ap_UplinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 225 "s1ap.cnf"
+#line 229 "s1ap.cnf"
        /* Set the direction of the message */
        actx->pinfo->link_dir=P2P_DIR_UL;
 
@@ -6121,7 +6141,7 @@ dissect_s1ap_UplinkNonUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U
 
 static int
 dissect_s1ap_InitiatingMessage_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 92 "s1ap.cnf"
+#line 96 "s1ap.cnf"
        message_type = INITIATING_MESSAGE;
 
   offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_InitiatingMessageValue);
@@ -6149,7 +6169,7 @@ dissect_s1ap_InitiatingMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static int
 dissect_s1ap_SuccessfulOutcome_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 95 "s1ap.cnf"
+#line 99 "s1ap.cnf"
        message_type = SUCCESSFUL_OUTCOME;
 
   offset = dissect_per_open_type_pdu_new(tvb, offset, actx, tree, hf_index, dissect_SuccessfulOutcomeValue);
@@ -6177,7 +6197,7 @@ dissect_s1ap_SuccessfulOutcome(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *ac
 
 static int
 dissect_s1ap_UnsuccessfulOutcome_value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 98 "s1ap.cnf"
+#line 102 "s1ap.cnf"
        message_type = UNSUCCESSFUL_OUTCOME;
 
 
@@ -6414,11 +6434,11 @@ static int dissect_Global_ENB_ID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_,
   offset += 7; offset >>= 3;
   return offset;
 }
-static int dissect_ENB_StatusTransfer_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
+int dissect_s1ap_ENB_StatusTransfer_TransparentContainer_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_s1ap_ENB_StatusTransfer_TransparentContainer(tvb, offset, &asn1_ctx, tree, hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU);
+  offset = dissect_s1ap_ENB_StatusTransfer_TransparentContainer(tvb, offset, &asn1_ctx, tree, hf_s1ap_s1ap_ENB_StatusTransfer_TransparentContainer_PDU);
   offset += 7; offset >>= 3;
   return offset;
 }
@@ -6606,6 +6626,14 @@ static int dissect_PagingDRX_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_PS_ServiceNotAvailable_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_s1ap_PS_ServiceNotAvailable(tvb, offset, &asn1_ctx, tree, hf_s1ap_PS_ServiceNotAvailable_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_RelativeMMECapacity_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -7909,7 +7937,7 @@ proto_reg_handoff_s1ap(void)
   dissector_add("s1ap.ies", id_RelativeMMECapacity, new_create_dissector_handle(dissect_RelativeMMECapacity_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_SourceMME_UE_S1AP_ID, new_create_dissector_handle(dissect_MME_UE_S1AP_ID_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_Bearers_SubjectToStatusTransfer_Item, new_create_dissector_handle(dissect_Bearers_SubjectToStatusTransfer_Item_PDU, proto_s1ap));
-  dissector_add("s1ap.ies", id_eNB_StatusTransfer_TransparentContainer, new_create_dissector_handle(dissect_ENB_StatusTransfer_TransparentContainer_PDU, proto_s1ap));
+  dissector_add("s1ap.ies", id_eNB_StatusTransfer_TransparentContainer, new_create_dissector_handle(dissect_s1ap_ENB_StatusTransfer_TransparentContainer_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionItem, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionItem_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_ResetType, new_create_dissector_handle(dissect_ResetType_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_UE_associatedLogicalS1_ConnectionListResAck, new_create_dissector_handle(dissect_UE_associatedLogicalS1_ConnectionListResAck_PDU, proto_s1ap));
@@ -7965,6 +7993,7 @@ proto_reg_handoff_s1ap(void)
   dissector_add("s1ap.ies", id_CSGMembershipStatus, new_create_dissector_handle(dissect_CSGMembershipStatus_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_LPPa_PDU, new_create_dissector_handle(dissect_LPPa_PDU_PDU, proto_s1ap));
   dissector_add("s1ap.ies", id_Routing_ID, new_create_dissector_handle(dissect_Routing_ID_PDU, proto_s1ap));
+  dissector_add("s1ap.ies", id_PS_ServiceNotAvailable, new_create_dissector_handle(dissect_PS_ServiceNotAvailable_PDU, proto_s1ap));
   dissector_add("s1ap.extension", id_Data_Forwarding_Not_Possible, new_create_dissector_handle(dissect_Data_Forwarding_Not_Possible_PDU, proto_s1ap));
   dissector_add("s1ap.extension", id_Time_Synchronization_Info, new_create_dissector_handle(dissect_TimeSynchronizationInfo_PDU, proto_s1ap));
   dissector_add("s1ap.proc.imsg", id_HandoverPreparation, new_create_dissector_handle(dissect_HandoverRequired_PDU, proto_s1ap));
@@ -8165,7 +8194,7 @@ void proto_register_s1ap(void) {
       { "Global-ENB-ID", "s1ap.Global_ENB_ID",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_s1ap_ENB_StatusTransfer_TransparentContainer_PDU,
+    { &hf_s1ap_s1ap_ENB_StatusTransfer_TransparentContainer_PDU,
       { "ENB-StatusTransfer-TransparentContainer", "s1ap.ENB_StatusTransfer_TransparentContainer",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
@@ -8261,6 +8290,10 @@ void proto_register_s1ap(void) {
       { "PagingDRX", "s1ap.PagingDRX",
         FT_UINT32, BASE_DEC, VALS(s1ap_PagingDRX_vals), 0,
         NULL, HFILL }},
+    { &hf_s1ap_PS_ServiceNotAvailable_PDU,
+      { "PS-ServiceNotAvailable", "s1ap.PS_ServiceNotAvailable",
+        FT_UINT32, BASE_DEC, VALS(s1ap_PS_ServiceNotAvailable_vals), 0,
+        NULL, HFILL }},
     { &hf_s1ap_RelativeMMECapacity_PDU,
       { "RelativeMMECapacity", "s1ap.RelativeMMECapacity",
         FT_UINT32, BASE_DEC, NULL, 0,

diff --git a/epan/dissectors/packet-s1ap.h b/epan/dissectors/packet-s1ap.h
index c7901936dba74d4f64e088c27d3c5dade1121369..715e82ba180335281a2d936d2c7d23ffe499a727 100644 (file)
--- a/epan/dissectors/packet-s1ap.h
+++ b/epan/dissectors/packet-s1ap.h
@@ -41,6 +41,7 @@ WS_VAR_IMPORT const value_string s1ap_CauseProtocol_vals[];
 WS_VAR_IMPORT const value_string s1ap_CauseRadioNetwork_vals[];
 WS_VAR_IMPORT const value_string s1ap_CauseTransport_vals[];
 WS_VAR_IMPORT const value_string s1ap_CauseNas_vals[];
+int dissect_s1ap_ENB_StatusTransfer_TransparentContainer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_);
 
 /*--- End of included file: packet-s1ap-exp.h ---*/
 #line 29 "packet-s1ap-template.h"