diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index 12628b0b05..55bdac54ec 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -54,7 +54,7 @@ TargetRNC-ToSourceRNC-TransparentContainer #.OMIT_ASSIGNMENT # Get rid of unused code warnings -ProtocolIE-FieldPair +ProtocolIE-FieldPair ProtocolIE-ContainerPair ProtocolIE-ContainerPairList ProtocolError-IE-ContainerList @@ -93,17 +93,17 @@ ProtocolIE-Field/value ie_field_value -#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue +#.FN_PARS ProtocolIE-Field/value FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldValue # Currently not used -# FN_PARS ProtocolIE-FieldPair/firstValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue -# FN_PARS ProtocolIE-FieldPair/secondValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue +# FN_PARS ProtocolIE-FieldPair/firstValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairFirstValue +# FN_PARS ProtocolIE-FieldPair/secondValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolIEFieldPairSecondValue #.FN_PARS ProtocolExtensionID VAL_PTR=&ProtocolExtensionID #.FN_PARS ProtocolExtensionField/extensionValue FN_VARIANT=_pdu_new TYPE_REF_FN=dissect_ProtocolExtensionFieldExtensionValue #.FN_PARS ProcedureCode VAL_PTR = &ProcedureCode #.FN_FTR ProcedureCode - col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(ProcedureCode, &s1ap_ProcedureCode_vals_ext, "unknown message")); #.END @@ -194,9 +194,9 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 3, 3, FALSE, ¶meter_tvb); - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -214,7 +214,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") return offset; length = tvb_length(parameter_tvb); - + is_ascii = TRUE; for (p_offset=0; p_offset < length; p_offset++){ if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){ @@ -231,7 +231,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY NAS-PDU VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; - + %(DEFAULT_BODY)s if ((tvb_length(parameter_tvb)>0)&&(nas_eps_handle)) @@ -240,7 +240,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") #.FN_BODY LPPa-PDU VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb=NULL; - + %(DEFAULT_BODY)s if ((tvb_length(parameter_tvb)>0)&&(lppa_handle)) @@ -250,12 +250,12 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; - + %(DEFAULT_BODY)s if (!parameter_tvb) return offset; -# The Transport Layer Address signalled in S1-AP messages is a bit string of +# The Transport Layer Address signalled in S1-AP messages is a bit string of # a) 32 bits in case of IPv4 address according to [6]; and # b) 128 bits in case of IPv6 address according to [5]. /* Get the length */ @@ -292,24 +292,24 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") handover_type_value = 0; #.FN_HDR HandoverRequest handover_type_value = 0; - + #.FN_BODY Source-ToTarget-TransparentContainer VAL_PTR = ¶meter_tvb # I think the message is "directly encoded" into the octest string(no "double encoding") # (Compare RANAP) # Annex A # ...Therefore the container content is encoded according to the # rules which are specified for the target radio system. In section 8.4.1.2, -# it is described how the container shall be encoded with respect to the scenario +# it is described how the container shall be encoded with respect to the scenario # in which it is used. tvbuff_t *parameter_tvb; proto_tree *subtree; - + %(DEFAULT_BODY)s subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToTargetTransparentContainer); switch(handover_type_value){ - /* + /* HandoverType ::= ENUMERATED { intralte, ltetoutran, @@ -317,23 +317,23 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") utrantolte, gerantolte, ... - } */ + } */ case 0: - /* intralte + /* intralte Intra E-UTRAN handover Source eNB to Target eNB - Transparent Container 36.413 + Transparent Container 36.413 */ dissect_SourceeNB_ToTargeteNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 1: - /* ltetoutran + /* ltetoutran Source RNC to Target RNC Transparent Container 25.413 */ dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 2: - /* ltetogeran + /* ltetogeran Source BSS to Target BSS Transparent Container 48.018 */ @@ -356,13 +356,13 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") tvbuff_t *parameter_tvb; proto_tree *subtree; - + %(DEFAULT_BODY)s subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToSourceTransparentContainer); switch(handover_type_value){ - /* + /* HandoverType ::= ENUMERATED { intralte, ltetoutran, @@ -370,23 +370,23 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") utrantolte, gerantolte, ... - } */ + } */ case 0: - /* intralte + /* intralte Intra E-UTRAN handover Target eNB to Source eNB - Transparent Container 36.413 + Transparent Container 36.413 */ dissect_TargeteNB_ToSourceeNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 1: - /* ltetoutran + /* ltetoutran Target RNC to Source RNC Transparent Container 25.413 */ dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 2: - /* ltetogeran + /* ltetogeran Target BSS to Source BSS Transparent Container 48.018 */ @@ -414,36 +414,36 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") # Includes the RRC Handover Preparation Information message as defined # in subclause 10.2.2 of [16]. # [16] 3GPP TS 36.331: "Evolved Universal Terrestrial Radio Access (E-UTRAN); Radio Resource -# Control (RRC) Protocol Specification3GPP TS 36.331: +# Control (RRC) Protocol Specification3GPP TS 36.331: # "Evolved Universal Terrestrial Radio Access (E-UTRAN); Radio Resource # Control (RRC) Protocol Specification. -# : +# : # 9.2.1.7 Source eNB to Target eNB Transparent Container # The Source eNB to target eNB Transparent Container IE is an information element -# that is produced by the source eNB and is transmitted to the target eNB. +# that is produced by the source eNB and is transmitted to the target eNB. # For inter-system handovers to E-UTRAN, the IE is transmitted from the external # handover source to the target eNB. This IE is transparent to the EPC. # -# RRC Container M OCTET STRING Includes the RRC Handover Preparation Information +# RRC Container M OCTET STRING Includes the RRC Handover Preparation Information # message as defined in subclause 10.2.2 of [16]. # : # 9.2.1.8 Target eNB to Source eNB Transparent Container -# The Target eNB to Source eNB Transparent Container IE is an information element -# that is produced by the target eNB and is transmitted to the source eNB. +# The Target eNB to Source eNB Transparent Container IE is an information element +# that is produced by the target eNB and is transmitted to the source eNB. # For inter-system handovers to E-UTRAN, the IE is transmitted from the target # eNB to the external relocation source. # : # RRC Container M OCTET STRING Includes the RRC E-UTRA Handover Command message # as defined in subclause 10.2.2 of [16]. # --- End quote --- -# Source eNB to Target eNB Transparent Container is present in +# Source eNB to Target eNB Transparent Container is present in # HandoverRequired and HandoverRequest. # Target eNB to Source eNB Transparent Container is present in -# HandoverCommand and HandoverRequestAcknowledge. +# HandoverCommand and HandoverRequestAcknowledge. tvbuff_t *parameter_tvb; proto_tree *subtree; - + %(DEFAULT_BODY)s if (!parameter_tvb) return offset; @@ -462,9 +462,9 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") default: break; } - - - + + + #.FN_BODY UERadioCapability VAL_PTR = ¶meter_tvb tvbuff_t *parameter_tvb; @@ -490,11 +490,11 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RIMInformation); if ((tvb_length(parameter_tvb)>0)&&(bssgp_handle)){ - col_set_fence(%(ACTX)s->pinfo->cinfo, COL_INFO); + col_set_fence(%(ACTX)s->pinfo->cinfo, COL_INFO); call_dissector(bssgp_handle,parameter_tvb,%(ACTX)s->pinfo, subtree); } - + #.TYPE_ATTR ProtocolExtensionID TYPE = FT_UINT8 DISPLAY = BASE_DEC|BASE_EXT_STRING STRINGS = &s1ap_ProtocolIE_ID_vals_ext @@ -760,16 +760,16 @@ SupportedTAs N s1ap.ies id-SupportedTAs TimeToWait N s1ap.ies id-TimeToWait UEAggregateMaximumBitrate N s1ap.ies id-uEaggregateMaximumBitrate TAI N s1ap.ies id-TAI -E-RABReleaseListBearerRelComp N s1ap.ies id-E-RABReleaseListBearerRelComp -Cdma2000PDU N s1ap.ies id-cdma2000PDU -Cdma2000RATType N s1ap.ies id-cdma2000RATType -Cdma2000SectorID N s1ap.ies id-cdma2000SectorID -SecurityKey N s1ap.ies id-SecurityKey -UERadioCapability N s1ap.ies id-UERadioCapability -GUMMEI N s1ap.ies id-GUMMEI-ID -E-RABInformationListItem N s1ap.ies id-E-RABInformationListItem -Direct-Forwarding-Path-Availability N s1ap.ies id-Direct-Forwarding-Path-Availability -UEIdentityIndexValue N s1ap.ies id-UEIdentityIndexValue +E-RABReleaseListBearerRelComp N s1ap.ies id-E-RABReleaseListBearerRelComp +Cdma2000PDU N s1ap.ies id-cdma2000PDU +Cdma2000RATType N s1ap.ies id-cdma2000RATType +Cdma2000SectorID N s1ap.ies id-cdma2000SectorID +SecurityKey N s1ap.ies id-SecurityKey +UERadioCapability N s1ap.ies id-UERadioCapability +GUMMEI N s1ap.ies id-GUMMEI-ID +E-RABInformationListItem N s1ap.ies id-E-RABInformationListItem +Direct-Forwarding-Path-Availability N s1ap.ies id-Direct-Forwarding-Path-Availability +UEIdentityIndexValue N s1ap.ies id-UEIdentityIndexValue Cdma2000HOStatus N s1ap.ies id-cdma2000HOStatus Cdma2000HORequiredIndication N s1ap.ies id-cdma2000HORequiredIndication RelativeMMECapacity N s1ap.ies id-RelativeMMECapacity @@ -926,7 +926,7 @@ MMEConfigurationUpdateFailure N s1ap.proc.uout id-MMEConfigurationUpdate UplinkS1cdma2000tunneling N s1ap.proc.imsg id-UplinkS1cdma2000tunneling -UEContextModificationRequest N s1ap.proc.imsg id-UEContextModification +UEContextModificationRequest N s1ap.proc.imsg id-UEContextModification UEContextModificationResponse N s1ap.proc.sout id-UEContextModification UEContextModificationFailure N s1ap.proc.uout id-UEContextModification @@ -982,6 +982,101 @@ DownlinkNonUEAssociatedLPPaTransport N s1ap.proc.imsg id-downlinkNonUEAssociated UplinkNonUEAssociatedLPPaTransport N s1ap.proc.imsg id-uplinkNonUEAssociatedLPPaTransport +#.FN_HDR E-RABSetupRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupRequest "); +#.FN_HDR E-RABSetupResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupResponse "); +#.FN_HDR E-RABModifyRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyRequest "); +#.FN_HDR E-RABModifyResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyResponse "); +#.FN_HDR E-RABReleaseCommand + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseCommand "); +#.FN_HDR E-RABReleaseResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseResponse "); +#.FN_HDR E-RABReleaseIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseIndication "); + +#.FN_HDR InitialContextSetupRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupRequest "); +#.FN_HDR InitialContextSetupResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupResponse "); +#.FN_HDR InitialContextSetupFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupFailure "); +#.FN_HDR UEContextReleaseRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseRequest "); +#.FN_HDR UEContextReleaseCommand + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseCommand "); +#.FN_HDR UEContextReleaseComplete + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseComplete "); +#.FN_HDR UEContextModificationRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationRequest "); +#.FN_HDR UEContextModificationResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationResponse "); +#.FN_HDR UEContextModificationFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationFailure "); + +#.FN_HDR HandoverRequired + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequired "); +#.FN_HDR HandoverCommand + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCommand "); +#.FN_HDR HandoverPreparationFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverPreparationFailure "); +#.FN_HDR HandoverRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequest "); +#.FN_HDR HandoverRequestAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequestAcknowledge "); +#.FN_HDR HandoverFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverFailure "); +#.FN_HDR HandoverNotify + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverNotify "); +#.FN_HDR PathSwitchRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequest "); +#.FN_HDR PathSwitchRequestAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestAcknowledge "); +#.FN_HDR PathSwitchRequestFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestFailure "); +#.FN_HDR HandoverCancel + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancel "); +#.FN_HDR HandoverCancelAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancelAcknowledge "); + + +#.FN_HDR Reset + col_append_str(actx->pinfo->cinfo, COL_INFO, ", Reset "); +#.FN_HDR ResetAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ResetAcknowledge "); +# FN_HDR ErrorIndication +# col_append_str(actx->pinfo->cinfo, COL_INFO, ", ErrorIndication "); +#.FN_HDR S1SetupRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupRequest "); +#.FN_HDR S1SetupResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupResponse "); +#.FN_HDR S1SetupFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupFailure "); +#.FN_HDR ENBConfigurationUpdate + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdate "); +#.FN_HDR ENBConfigurationUpdateAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateAcknowledge "); +#.FN_HDR ENBConfigurationUpdateFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateFailure "); +#.FN_HDR MMEConfigurationUpdate + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdate "); +#.FN_HDR MMEConfigurationUpdateAcknowledge + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateAcknowledge "); +#.FN_HDR MMEConfigurationUpdateFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateFailure "); + +#.FN_HDR WriteReplaceWarningRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningRequest "); +#.FN_HDR WriteReplaceWarningResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningResponse "); +#.FN_HDR KillRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillRequest "); +#.FN_HDR KillResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillResponse "); + + #.TYPE_ATTR BitRate TYPE = FT_UINT64 DISPLAY = BASE_DEC STRINGS = NULL #.END diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index de90a5ce11..1c21d477e3 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -1230,7 +1230,7 @@ dissect_s1ap_ProcedureCode(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ 0U, 255U, &ProcedureCode, FALSE); #line 106 "../../asn1/s1ap/s1ap.cnf" - col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ", + col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(ProcedureCode, &s1ap_ProcedureCode_vals_ext, "unknown message")); @@ -1609,9 +1609,9 @@ dissect_s1ap_PLMNidentity(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, 3, 3, FALSE, ¶meter_tvb); - if(tvb_length(tvb)==0) + if(tvb_length(tvb)==0) return offset; - + if (!parameter_tvb) return offset; dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, tree, 0, FALSE); @@ -3131,7 +3131,7 @@ dissect_s1ap_ENBname(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr return offset; length = tvb_length(parameter_tvb); - + is_ascii = TRUE; for (p_offset=0; p_offset < length; p_offset++){ if(!isalpha(tvb_get_guint8(parameter_tvb, p_offset ))){ @@ -3155,7 +3155,7 @@ dissect_s1ap_TransportLayerAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t tvbuff_t *parameter_tvb=NULL; proto_tree *subtree; gint tvb_len; - + offset = dissect_per_bit_string(tvb, offset, actx, tree, hf_index, 1, 160, TRUE, ¶meter_tvb); @@ -3828,7 +3828,7 @@ dissect_s1ap_LPPa_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, p #line 241 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); @@ -4052,7 +4052,7 @@ dissect_s1ap_NAS_PDU(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, pr #line 232 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb=NULL; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); @@ -4262,11 +4262,11 @@ dissect_s1ap_RIMInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_RIMInformation); if ((tvb_length(parameter_tvb)>0)&&(bssgp_handle)){ - col_set_fence(actx->pinfo->cinfo, COL_INFO); + col_set_fence(actx->pinfo->cinfo, COL_INFO); call_dissector(bssgp_handle,parameter_tvb,actx->pinfo, subtree); } - + return offset; @@ -4357,7 +4357,7 @@ dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ tvbuff_t *parameter_tvb; proto_tree *subtree; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); @@ -4378,9 +4378,9 @@ dissect_s1ap_RRC_Container(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ default: break; } - - - + + + @@ -4587,7 +4587,7 @@ dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset #line 304 "../../asn1/s1ap/s1ap.cnf" tvbuff_t *parameter_tvb; proto_tree *subtree; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); @@ -4595,7 +4595,7 @@ dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToTargetTransparentContainer); switch(handover_type_value){ - /* + /* HandoverType ::= ENUMERATED { intralte, ltetoutran, @@ -4603,23 +4603,23 @@ dissect_s1ap_Source_ToTarget_TransparentContainer(tvbuff_t *tvb _U_, int offset utrantolte, gerantolte, ... - } */ + } */ case 0: - /* intralte + /* intralte Intra E-UTRAN handover Source eNB to Target eNB - Transparent Container 36.413 + Transparent Container 36.413 */ dissect_SourceeNB_ToTargeteNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 1: - /* ltetoutran + /* ltetoutran Source RNC to Target RNC Transparent Container 25.413 */ dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 2: - /* ltetogeran + /* ltetogeran Source BSS to Target BSS Transparent Container 48.018 */ @@ -4939,7 +4939,7 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset tvbuff_t *parameter_tvb; proto_tree *subtree; - + offset = dissect_per_octet_string(tvb, offset, actx, tree, hf_index, NO_BOUND, NO_BOUND, FALSE, ¶meter_tvb); @@ -4947,7 +4947,7 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_ToSourceTransparentContainer); switch(handover_type_value){ - /* + /* HandoverType ::= ENUMERATED { intralte, ltetoutran, @@ -4955,23 +4955,23 @@ dissect_s1ap_Target_ToSource_TransparentContainer(tvbuff_t *tvb _U_, int offset utrantolte, gerantolte, ... - } */ + } */ case 0: - /* intralte + /* intralte Intra E-UTRAN handover Target eNB to Source eNB - Transparent Container 36.413 + Transparent Container 36.413 */ dissect_TargeteNB_ToSourceeNB_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 1: - /* ltetoutran + /* ltetoutran Target RNC to Source RNC Transparent Container 25.413 */ dissect_ranap_TargetRNC_ToSourceRNC_TransparentContainer_PDU(parameter_tvb, actx->pinfo, subtree); break; case 2: - /* ltetogeran + /* ltetogeran Target BSS to Source BSS Transparent Container 48.018 */ @@ -5338,6 +5338,7 @@ 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 290 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequired "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverRequired, HandoverRequired_sequence); @@ -5355,6 +5356,7 @@ 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 292 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCommand "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverCommand, HandoverCommand_sequence); @@ -5398,6 +5400,9 @@ static const per_sequence_t HandoverPreparationFailure_sequence[] = { static int dissect_s1ap_HandoverPreparationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1024 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverPreparationFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverPreparationFailure, HandoverPreparationFailure_sequence); @@ -5414,7 +5419,8 @@ 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 294 "../../asn1/s1ap/s1ap.cnf" handover_type_value = 0; - + + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverRequest, HandoverRequest_sequence); @@ -5457,6 +5463,9 @@ static const per_sequence_t HandoverRequestAcknowledge_sequence[] = { static int dissect_s1ap_HandoverRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1028 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverRequestAcknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverRequestAcknowledge, HandoverRequestAcknowledge_sequence); @@ -5526,6 +5535,9 @@ static const per_sequence_t HandoverFailure_sequence[] = { static int dissect_s1ap_HandoverFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1030 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverFailure, HandoverFailure_sequence); @@ -5540,6 +5552,9 @@ static const per_sequence_t HandoverNotify_sequence[] = { static int dissect_s1ap_HandoverNotify(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1032 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverNotify "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverNotify, HandoverNotify_sequence); @@ -5554,6 +5569,9 @@ static const per_sequence_t PathSwitchRequest_sequence[] = { static int dissect_s1ap_PathSwitchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1034 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PathSwitchRequest, PathSwitchRequest_sequence); @@ -5594,6 +5612,9 @@ static const per_sequence_t PathSwitchRequestAcknowledge_sequence[] = { static int dissect_s1ap_PathSwitchRequestAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1036 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestAcknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PathSwitchRequestAcknowledge, PathSwitchRequestAcknowledge_sequence); @@ -5634,6 +5655,9 @@ static const per_sequence_t PathSwitchRequestFailure_sequence[] = { static int dissect_s1ap_PathSwitchRequestFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1038 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PathSwitchRequestFailure, PathSwitchRequestFailure_sequence); @@ -5648,6 +5672,9 @@ static const per_sequence_t HandoverCancel_sequence[] = { static int dissect_s1ap_HandoverCancel(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1040 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancel "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverCancel, HandoverCancel_sequence); @@ -5662,6 +5689,11 @@ static const per_sequence_t HandoverCancelAcknowledge_sequence[] = { static int dissect_s1ap_HandoverCancelAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1042 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancelAcknowledge "); + + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_HandoverCancelAcknowledge, HandoverCancelAcknowledge_sequence); @@ -5676,6 +5708,9 @@ static const per_sequence_t E_RABSetupRequest_sequence[] = { static int dissect_s1ap_E_RABSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 986 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABSetupRequest, E_RABSetupRequest_sequence); @@ -5723,6 +5758,9 @@ static const per_sequence_t E_RABSetupResponse_sequence[] = { static int dissect_s1ap_E_RABSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 988 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABSetupResponse, E_RABSetupResponse_sequence); @@ -5768,6 +5806,9 @@ static const per_sequence_t E_RABModifyRequest_sequence[] = { static int dissect_s1ap_E_RABModifyRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 990 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABModifyRequest, E_RABModifyRequest_sequence); @@ -5813,6 +5854,9 @@ static const per_sequence_t E_RABModifyResponse_sequence[] = { static int dissect_s1ap_E_RABModifyResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 992 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABModifyResponse, E_RABModifyResponse_sequence); @@ -5856,6 +5900,9 @@ static const per_sequence_t E_RABReleaseCommand_sequence[] = { static int dissect_s1ap_E_RABReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 994 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseCommand "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABReleaseCommand, E_RABReleaseCommand_sequence); @@ -5870,6 +5917,9 @@ static const per_sequence_t E_RABReleaseResponse_sequence[] = { static int dissect_s1ap_E_RABReleaseResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 996 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABReleaseResponse, E_RABReleaseResponse_sequence); @@ -5913,6 +5963,10 @@ static const per_sequence_t E_RABReleaseIndication_sequence[] = { static int dissect_s1ap_E_RABReleaseIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 998 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseIndication "); + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABReleaseIndication, E_RABReleaseIndication_sequence); @@ -5927,6 +5981,9 @@ static const per_sequence_t InitialContextSetupRequest_sequence[] = { static int dissect_s1ap_InitialContextSetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1001 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_InitialContextSetupRequest, InitialContextSetupRequest_sequence); @@ -5974,6 +6031,9 @@ static const per_sequence_t InitialContextSetupResponse_sequence[] = { static int dissect_s1ap_InitialContextSetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1003 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_InitialContextSetupResponse, InitialContextSetupResponse_sequence); @@ -6019,6 +6079,9 @@ static const per_sequence_t InitialContextSetupFailure_sequence[] = { static int dissect_s1ap_InitialContextSetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1005 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_InitialContextSetupFailure, InitialContextSetupFailure_sequence); @@ -6076,6 +6139,9 @@ static const per_sequence_t UEContextReleaseRequest_sequence[] = { static int dissect_s1ap_UEContextReleaseRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1007 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextReleaseRequest, UEContextReleaseRequest_sequence); @@ -6090,6 +6156,9 @@ static const per_sequence_t UEContextReleaseCommand_sequence[] = { static int dissect_s1ap_UEContextReleaseCommand(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1009 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseCommand "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextReleaseCommand, UEContextReleaseCommand_sequence); @@ -6104,6 +6173,9 @@ static const per_sequence_t UEContextReleaseComplete_sequence[] = { static int dissect_s1ap_UEContextReleaseComplete(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1011 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseComplete "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextReleaseComplete, UEContextReleaseComplete_sequence); @@ -6118,6 +6190,9 @@ static const per_sequence_t UEContextModificationRequest_sequence[] = { static int dissect_s1ap_UEContextModificationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1013 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextModificationRequest, UEContextModificationRequest_sequence); @@ -6132,6 +6207,9 @@ static const per_sequence_t UEContextModificationResponse_sequence[] = { static int dissect_s1ap_UEContextModificationResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1015 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextModificationResponse, UEContextModificationResponse_sequence); @@ -6146,6 +6224,10 @@ static const per_sequence_t UEContextModificationFailure_sequence[] = { static int dissect_s1ap_UEContextModificationFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1017 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationFailure "); + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextModificationFailure, UEContextModificationFailure_sequence); @@ -6231,6 +6313,9 @@ static const per_sequence_t Reset_sequence[] = { static int dissect_s1ap_Reset(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1046 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", Reset "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_Reset, Reset_sequence); @@ -6296,6 +6381,9 @@ static const per_sequence_t ResetAcknowledge_sequence[] = { static int dissect_s1ap_ResetAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1048 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ResetAcknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ResetAcknowledge, ResetAcknowledge_sequence); @@ -6338,6 +6426,9 @@ static const per_sequence_t S1SetupRequest_sequence[] = { static int dissect_s1ap_S1SetupRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1052 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_S1SetupRequest, S1SetupRequest_sequence); @@ -6352,6 +6443,9 @@ static const per_sequence_t S1SetupResponse_sequence[] = { static int dissect_s1ap_S1SetupResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1054 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_S1SetupResponse, S1SetupResponse_sequence); @@ -6366,6 +6460,9 @@ static const per_sequence_t S1SetupFailure_sequence[] = { static int dissect_s1ap_S1SetupFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1056 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_S1SetupFailure, S1SetupFailure_sequence); @@ -6380,6 +6477,9 @@ static const per_sequence_t ENBConfigurationUpdate_sequence[] = { static int dissect_s1ap_ENBConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1058 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdate "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBConfigurationUpdate, ENBConfigurationUpdate_sequence); @@ -6394,6 +6494,9 @@ static const per_sequence_t ENBConfigurationUpdateAcknowledge_sequence[] = { static int dissect_s1ap_ENBConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1060 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateAcknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBConfigurationUpdateAcknowledge, ENBConfigurationUpdateAcknowledge_sequence); @@ -6408,6 +6511,9 @@ static const per_sequence_t ENBConfigurationUpdateFailure_sequence[] = { static int dissect_s1ap_ENBConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1062 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBConfigurationUpdateFailure, ENBConfigurationUpdateFailure_sequence); @@ -6422,6 +6528,9 @@ static const per_sequence_t MMEConfigurationUpdate_sequence[] = { static int dissect_s1ap_MMEConfigurationUpdate(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1064 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdate "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEConfigurationUpdate, MMEConfigurationUpdate_sequence); @@ -6436,6 +6545,9 @@ static const per_sequence_t MMEConfigurationUpdateAcknowledge_sequence[] = { static int dissect_s1ap_MMEConfigurationUpdateAcknowledge(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1066 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateAcknowledge "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEConfigurationUpdateAcknowledge, MMEConfigurationUpdateAcknowledge_sequence); @@ -6450,6 +6562,10 @@ static const per_sequence_t MMEConfigurationUpdateFailure_sequence[] = { static int dissect_s1ap_MMEConfigurationUpdateFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1068 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateFailure "); + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEConfigurationUpdateFailure, MMEConfigurationUpdateFailure_sequence); @@ -6660,6 +6776,9 @@ static const per_sequence_t WriteReplaceWarningRequest_sequence[] = { static int dissect_s1ap_WriteReplaceWarningRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1071 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_WriteReplaceWarningRequest, WriteReplaceWarningRequest_sequence); @@ -6674,6 +6793,9 @@ static const per_sequence_t WriteReplaceWarningResponse_sequence[] = { static int dissect_s1ap_WriteReplaceWarningResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1073 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_WriteReplaceWarningResponse, WriteReplaceWarningResponse_sequence); @@ -6778,6 +6900,9 @@ static const per_sequence_t KillRequest_sequence[] = { static int dissect_s1ap_KillRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1075 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_KillRequest, KillRequest_sequence); @@ -6792,6 +6917,11 @@ static const per_sequence_t KillResponse_sequence[] = { static int dissect_s1ap_KillResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1077 "../../asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillResponse "); + + + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_KillResponse, KillResponse_sequence);