diff --git a/epan/dissectors/asn1/s1ap/s1ap.cnf b/epan/dissectors/asn1/s1ap/s1ap.cnf index 738bc6628c..21f20316b6 100644 --- a/epan/dissectors/asn1/s1ap/s1ap.cnf +++ b/epan/dissectors/asn1/s1ap/s1ap.cnf @@ -1636,39 +1636,6 @@ UEContextResumeRequest N s1ap.proc.imsg id-UEContextResume UEContextResumeResponse N s1ap.proc.sout id-UEContextResume UEContextResumeFailure N s1ap.proc.uout id-UEContextResume -#.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 "); @@ -1694,8 +1661,54 @@ UEContextResumeFailure N s1ap.proc.uout id-UEContextResume col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancel "); #.FN_HDR HandoverCancelAcknowledge col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancelAcknowledge "); - - +#.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 Paging + col_append_str(actx->pinfo->cinfo, COL_INFO, ", Paging "); +#.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 UERadioCapabilityMatchRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchRequest "); +#.FN_HDR UERadioCapabilityMatchResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchResponse "); +#.FN_HDR DownlinkNASTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNASTransport "); +#.FN_HDR InitialUEMessage + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialUEMessage "); +#.FN_HDR UplinkNASTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNASTransport "); +#.FN_HDR NASNonDeliveryIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", NASNonDeliveryIndication "); +#.FN_HDR RerouteNASRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", RerouteNASRequest "); #.FN_HDR Reset col_append_str(actx->pinfo->cinfo, COL_INFO, ", Reset "); #.FN_HDR ResetAcknowledge @@ -1720,53 +1733,86 @@ UEContextResumeFailure N s1ap.proc.uout id-UEContextResume col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateAcknowledge "); #.FN_HDR MMEConfigurationUpdateFailure col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateFailure "); - +#.FN_HDR DownlinkS1cdma2000tunnelling + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkS1cdma2000tunnelling "); +#.FN_HDR UplinkS1cdma2000tunnelling + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkS1cdma2000tunnelling "); +#.FN_HDR UECapabilityInfoIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UECapabilityInfoIndication "); +#.FN_HDR ENBStatusTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBStatusTransfer "); +#.FN_HDR MMEStatusTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEStatusTransfer "); +#.FN_HDR TraceStart + col_append_str(actx->pinfo->cinfo, COL_INFO, ", TraceStart "); +#.FN_HDR TraceFailureIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", TraceFailureIndication "); +#.FN_HDR DeactivateTrace + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DeactivateTrace "); +#.FN_HDR CellTrafficTrace + col_append_str(actx->pinfo->cinfo, COL_INFO, ", CellTrafficTrace "); +#.FN_HDR LocationReportingControl + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReportingControl "); +#.FN_HDR LocationReportingFailureIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReportingFailureIndication "); +#.FN_HDR LocationReport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReport "); +#.FN_HDR OverloadStart + col_append_str(actx->pinfo->cinfo, COL_INFO, ", OverloadStart "); +#.FN_HDR OverloadStop + col_append_str(actx->pinfo->cinfo, COL_INFO, ", OverloadStop "); #.FN_HDR WriteReplaceWarningRequest col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningRequest "); dataCodingScheme = SMS_ENCODING_NOT_SET; #.FN_HDR WriteReplaceWarningResponse col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningResponse "); +#.FN_HDR ENBDirectInformationTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBDirectInformationTransfer "); +#.FN_HDR MMEDirectInformationTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEDirectInformationTransfer "); +#.FN_HDR ENBConfigurationTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationTransfer "); +#.FN_HDR MMEConfigurationTransfer + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationTransfer "); +#.FN_HDR PrivateMessage + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PrivateMessage "); #.FN_HDR KillRequest col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillRequest "); #.FN_HDR KillResponse col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillResponse "); - -#.FN_HDR DownlinkUEAssociatedLPPaTransport - col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkUEAssociatedLPPaTransport "); - -#.FN_HDR UplinkUEAssociatedLPPaTransport - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkUEAssociatedLPPaTransport "); - -#.FN_HDR DownlinkNonUEAssociatedLPPaTransport - col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNonUEAssociatedLPPaTransport "); - -#.FN_HDR UplinkNonUEAssociatedLPPaTransport - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNonUEAssociatedLPPaTransport "); - -#.FN_HDR UERadioCapabilityMatchRequest - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchRequest "); - -#.FN_HDR UERadioCapabilityMatchResponse - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchResponse "); - -#.FN_HDR E-RABModificationIndication - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationIndication "); - -#.FN_HDR E-RABModificationConfirm - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationConfirm "); - -#.FN_HDR UEContextModificationIndication - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationIndication "); - -#.FN_HDR UEContextModificationConfirm - col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationConfirm "); - -#.FN_HDR RerouteNASRequest - col_append_str(actx->pinfo->cinfo, COL_INFO, ", RerouteNASRequest "); - +#.FN_HDR PWSRestartIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PWSRestartIndication "); #.FN_HDR PWSFailureIndication col_append_str(actx->pinfo->cinfo, COL_INFO, ", PWSFailureIndication "); - +#.FN_HDR DownlinkUEAssociatedLPPaTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkUEAssociatedLPPaTransport "); +#.FN_HDR UplinkUEAssociatedLPPaTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkUEAssociatedLPPaTransport "); +#.FN_HDR DownlinkNonUEAssociatedLPPaTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNonUEAssociatedLPPaTransport "); +#.FN_HDR UplinkNonUEAssociatedLPPaTransport + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNonUEAssociatedLPPaTransport "); +#.FN_HDR E-RABModificationIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationIndication "); +#.FN_HDR E-RABModificationConfirm + col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationConfirm "); +#.FN_HDR UEContextModificationIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationIndication "); +#.FN_HDR UEContextModificationConfirm + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationConfirm "); +#.FN_HDR UEContextSuspendRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextSuspendRequest "); +#.FN_HDR UEContextSuspendResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextSuspendResponse "); +#.FN_HDR UEContextResumeRequest + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeRequest "); +#.FN_HDR UEContextResumeResponse + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeResponse "); +#.FN_HDR UEContextResumeFailure + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeFailure "); +#.FN_HDR ConnectionEstablishmentIndication + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ConnectionEstablishmentIndication "); +#.END /* Whenever a Cause appears, look up the reason and show it in the Info column */ diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index f3e886963c..199715114e 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -3285,7 +3285,7 @@ static value_string_ext s1ap_CauseRadioNetwork_vals_ext = VALUE_STRING_EXT_INIT( static int dissect_s1ap_CauseRadioNetwork(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1774 "./asn1/s1ap/s1ap.cnf" +#line 1820 "./asn1/s1ap/s1ap.cnf" guint32 value; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 36, &value, TRUE, 3, NULL); @@ -3307,7 +3307,7 @@ const value_string s1ap_CauseTransport_vals[] = { static int dissect_s1ap_CauseTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1779 "./asn1/s1ap/s1ap.cnf" +#line 1825 "./asn1/s1ap/s1ap.cnf" guint32 value; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 2, &value, TRUE, 0, NULL); @@ -3332,7 +3332,7 @@ const value_string s1ap_CauseNas_vals[] = { static int dissect_s1ap_CauseNas(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1784 "./asn1/s1ap/s1ap.cnf" +#line 1830 "./asn1/s1ap/s1ap.cnf" guint32 value; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 4, &value, TRUE, 1, NULL); @@ -3359,7 +3359,7 @@ const value_string s1ap_CauseProtocol_vals[] = { static int dissect_s1ap_CauseProtocol(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1789 "./asn1/s1ap/s1ap.cnf" +#line 1835 "./asn1/s1ap/s1ap.cnf" guint32 value; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 7, &value, TRUE, 0, NULL); @@ -3385,7 +3385,7 @@ const value_string s1ap_CauseMisc_vals[] = { static int dissect_s1ap_CauseMisc(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1794 "./asn1/s1ap/s1ap.cnf" +#line 1840 "./asn1/s1ap/s1ap.cnf" guint32 value; offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index, 6, &value, TRUE, 0, NULL); @@ -8063,7 +8063,7 @@ 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 1678 "./asn1/s1ap/s1ap.cnf" +#line 1645 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverPreparationFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8199,7 +8199,7 @@ 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 1684 "./asn1/s1ap/s1ap.cnf" +#line 1651 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8216,7 +8216,7 @@ 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 1686 "./asn1/s1ap/s1ap.cnf" +#line 1653 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverNotify "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8233,7 +8233,7 @@ 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 1688 "./asn1/s1ap/s1ap.cnf" +#line 1655 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8276,7 +8276,7 @@ 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 1690 "./asn1/s1ap/s1ap.cnf" +#line 1657 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestAcknowledge "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8319,7 +8319,7 @@ 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 1692 "./asn1/s1ap/s1ap.cnf" +#line 1659 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", PathSwitchRequestFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8336,7 +8336,7 @@ 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 1694 "./asn1/s1ap/s1ap.cnf" +#line 1661 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", HandoverCancel "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8353,11 +8353,9 @@ 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 1696 "./asn1/s1ap/s1ap.cnf" +#line 1663 "./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); @@ -8372,8 +8370,8 @@ 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 1640 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupRequest "); +#line 1665 "./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); @@ -8422,8 +8420,8 @@ 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 1642 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABSetupResponse "); +#line 1667 "./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); @@ -8470,8 +8468,8 @@ 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 1644 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyRequest "); +#line 1669 "./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); @@ -8518,8 +8516,8 @@ 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 1646 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABModifyResponse "); +#line 1671 "./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); @@ -8564,8 +8562,8 @@ 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 1648 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseCommand "); +#line 1673 "./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); @@ -8581,8 +8579,8 @@ 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 1650 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseResponse "); +#line 1675 "./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); @@ -8627,9 +8625,8 @@ 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 1652 "./asn1/s1ap/s1ap.cnf" - col_append_str(actx->pinfo->cinfo, COL_INFO, ", E_RABReleaseIndication "); - +#line 1677 "./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); @@ -8645,7 +8642,7 @@ 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 1655 "./asn1/s1ap/s1ap.cnf" +#line 1679 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8695,7 +8692,7 @@ 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 1657 "./asn1/s1ap/s1ap.cnf" +#line 1681 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupResponse "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8743,7 +8740,7 @@ 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 1659 "./asn1/s1ap/s1ap.cnf" +#line 1683 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialContextSetupFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8760,6 +8757,9 @@ static const per_sequence_t Paging_sequence[] = { static int dissect_s1ap_Paging(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1685 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", Paging "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_Paging, Paging_sequence); @@ -8803,7 +8803,7 @@ 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 1661 "./asn1/s1ap/s1ap.cnf" +#line 1687 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8820,7 +8820,7 @@ 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 1663 "./asn1/s1ap/s1ap.cnf" +#line 1689 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseCommand "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8837,7 +8837,7 @@ 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 1665 "./asn1/s1ap/s1ap.cnf" +#line 1691 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextReleaseComplete "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8854,7 +8854,7 @@ 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 1667 "./asn1/s1ap/s1ap.cnf" +#line 1693 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8871,7 +8871,7 @@ 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 1669 "./asn1/s1ap/s1ap.cnf" +#line 1695 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationResponse "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -8888,10 +8888,9 @@ 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 1671 "./asn1/s1ap/s1ap.cnf" +#line 1697 "./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); @@ -8906,10 +8905,9 @@ static const per_sequence_t UERadioCapabilityMatchRequest_sequence[] = { static int dissect_s1ap_UERadioCapabilityMatchRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1747 "./asn1/s1ap/s1ap.cnf" +#line 1699 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchRequest "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UERadioCapabilityMatchRequest, UERadioCapabilityMatchRequest_sequence); @@ -8924,10 +8922,9 @@ static const per_sequence_t UERadioCapabilityMatchResponse_sequence[] = { static int dissect_s1ap_UERadioCapabilityMatchResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1750 "./asn1/s1ap/s1ap.cnf" +#line 1701 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UERadioCapabilityMatchResponse "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UERadioCapabilityMatchResponse, UERadioCapabilityMatchResponse_sequence); @@ -8946,6 +8943,7 @@ dissect_s1ap_DownlinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_DL; + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNASTransport "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_DownlinkNASTransport, DownlinkNASTransport_sequence); @@ -8965,6 +8963,7 @@ dissect_s1ap_InitialUEMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_UL; + col_append_str(actx->pinfo->cinfo, COL_INFO, ", InitialUEMessage "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_InitialUEMessage, InitialUEMessage_sequence); @@ -8984,6 +8983,7 @@ dissect_s1ap_UplinkNASTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *a /* Set the direction of the message */ actx->pinfo->link_dir=P2P_DIR_UL; + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNASTransport "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UplinkNASTransport, UplinkNASTransport_sequence); @@ -8999,6 +8999,9 @@ static const per_sequence_t NASNonDeliveryIndication_sequence[] = { static int dissect_s1ap_NASNonDeliveryIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1709 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", NASNonDeliveryIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_NASNonDeliveryIndication, NASNonDeliveryIndication_sequence); @@ -9013,10 +9016,9 @@ static const per_sequence_t RerouteNASRequest_sequence[] = { static int dissect_s1ap_RerouteNASRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1765 "./asn1/s1ap/s1ap.cnf" +#line 1711 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", RerouteNASRequest "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_RerouteNASRequest, RerouteNASRequest_sequence); @@ -9052,7 +9054,7 @@ 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 1700 "./asn1/s1ap/s1ap.cnf" +#line 1713 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", Reset "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9120,7 +9122,7 @@ 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 1702 "./asn1/s1ap/s1ap.cnf" +#line 1715 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", ResetAcknowledge "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9165,7 +9167,7 @@ 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 1706 "./asn1/s1ap/s1ap.cnf" +#line 1719 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9182,7 +9184,7 @@ 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 1708 "./asn1/s1ap/s1ap.cnf" +#line 1721 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupResponse "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9199,7 +9201,7 @@ 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 1710 "./asn1/s1ap/s1ap.cnf" +#line 1723 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", S1SetupFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9216,7 +9218,7 @@ 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 1712 "./asn1/s1ap/s1ap.cnf" +#line 1725 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdate "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9233,7 +9235,7 @@ 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 1714 "./asn1/s1ap/s1ap.cnf" +#line 1727 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateAcknowledge "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9250,7 +9252,7 @@ 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 1716 "./asn1/s1ap/s1ap.cnf" +#line 1729 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationUpdateFailure "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9267,7 +9269,7 @@ 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 1718 "./asn1/s1ap/s1ap.cnf" +#line 1731 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdate "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9284,7 +9286,7 @@ 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 1720 "./asn1/s1ap/s1ap.cnf" +#line 1733 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationUpdateAcknowledge "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9301,10 +9303,9 @@ 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 1722 "./asn1/s1ap/s1ap.cnf" +#line 1735 "./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); @@ -9319,6 +9320,9 @@ static const per_sequence_t DownlinkS1cdma2000tunnelling_sequence[] = { static int dissect_s1ap_DownlinkS1cdma2000tunnelling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1737 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkS1cdma2000tunnelling "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_DownlinkS1cdma2000tunnelling, DownlinkS1cdma2000tunnelling_sequence); @@ -9333,6 +9337,9 @@ static const per_sequence_t UplinkS1cdma2000tunnelling_sequence[] = { static int dissect_s1ap_UplinkS1cdma2000tunnelling(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1739 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkS1cdma2000tunnelling "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UplinkS1cdma2000tunnelling, UplinkS1cdma2000tunnelling_sequence); @@ -9347,6 +9354,9 @@ static const per_sequence_t UECapabilityInfoIndication_sequence[] = { static int dissect_s1ap_UECapabilityInfoIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1741 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UECapabilityInfoIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UECapabilityInfoIndication, UECapabilityInfoIndication_sequence); @@ -9361,6 +9371,9 @@ static const per_sequence_t ENBStatusTransfer_sequence[] = { static int dissect_s1ap_ENBStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1743 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBStatusTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBStatusTransfer, ENBStatusTransfer_sequence); @@ -9375,6 +9388,9 @@ static const per_sequence_t MMEStatusTransfer_sequence[] = { static int dissect_s1ap_MMEStatusTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1745 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEStatusTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEStatusTransfer, MMEStatusTransfer_sequence); @@ -9389,6 +9405,9 @@ static const per_sequence_t TraceStart_sequence[] = { static int dissect_s1ap_TraceStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1747 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", TraceStart "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_TraceStart, TraceStart_sequence); @@ -9403,6 +9422,9 @@ static const per_sequence_t TraceFailureIndication_sequence[] = { static int dissect_s1ap_TraceFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1749 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", TraceFailureIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_TraceFailureIndication, TraceFailureIndication_sequence); @@ -9417,6 +9439,9 @@ static const per_sequence_t DeactivateTrace_sequence[] = { static int dissect_s1ap_DeactivateTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1751 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", DeactivateTrace "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_DeactivateTrace, DeactivateTrace_sequence); @@ -9431,6 +9456,9 @@ static const per_sequence_t CellTrafficTrace_sequence[] = { static int dissect_s1ap_CellTrafficTrace(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1753 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", CellTrafficTrace "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_CellTrafficTrace, CellTrafficTrace_sequence); @@ -9445,6 +9473,9 @@ static const per_sequence_t LocationReportingControl_sequence[] = { static int dissect_s1ap_LocationReportingControl(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1755 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReportingControl "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_LocationReportingControl, LocationReportingControl_sequence); @@ -9459,6 +9490,9 @@ static const per_sequence_t LocationReportingFailureIndication_sequence[] = { static int dissect_s1ap_LocationReportingFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1757 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReportingFailureIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_LocationReportingFailureIndication, LocationReportingFailureIndication_sequence); @@ -9473,6 +9507,9 @@ static const per_sequence_t LocationReport_sequence[] = { static int dissect_s1ap_LocationReport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1759 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", LocationReport "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_LocationReport, LocationReport_sequence); @@ -9487,6 +9524,9 @@ static const per_sequence_t OverloadStart_sequence[] = { static int dissect_s1ap_OverloadStart(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1761 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", OverloadStart "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_OverloadStart, OverloadStart_sequence); @@ -9501,6 +9541,9 @@ static const per_sequence_t OverloadStop_sequence[] = { static int dissect_s1ap_OverloadStop(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1763 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", OverloadStop "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_OverloadStop, OverloadStop_sequence); @@ -9515,7 +9558,7 @@ 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 1725 "./asn1/s1ap/s1ap.cnf" +#line 1765 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningRequest "); dataCodingScheme = SMS_ENCODING_NOT_SET; @@ -9533,7 +9576,7 @@ 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 1728 "./asn1/s1ap/s1ap.cnf" +#line 1768 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", WriteReplaceWarningResponse "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9550,6 +9593,9 @@ static const per_sequence_t ENBDirectInformationTransfer_sequence[] = { static int dissect_s1ap_ENBDirectInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1770 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBDirectInformationTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBDirectInformationTransfer, ENBDirectInformationTransfer_sequence); @@ -9584,6 +9630,9 @@ static const per_sequence_t MMEDirectInformationTransfer_sequence[] = { static int dissect_s1ap_MMEDirectInformationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1772 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEDirectInformationTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEDirectInformationTransfer, MMEDirectInformationTransfer_sequence); @@ -9598,6 +9647,9 @@ static const per_sequence_t ENBConfigurationTransfer_sequence[] = { static int dissect_s1ap_ENBConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1774 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ENBConfigurationTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ENBConfigurationTransfer, ENBConfigurationTransfer_sequence); @@ -9612,6 +9664,9 @@ static const per_sequence_t MMEConfigurationTransfer_sequence[] = { static int dissect_s1ap_MMEConfigurationTransfer(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1776 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", MMEConfigurationTransfer "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_MMEConfigurationTransfer, MMEConfigurationTransfer_sequence); @@ -9626,6 +9681,9 @@ static const per_sequence_t PrivateMessage_sequence[] = { static int dissect_s1ap_PrivateMessage(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1778 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PrivateMessage "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PrivateMessage, PrivateMessage_sequence); @@ -9640,7 +9698,7 @@ 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 1730 "./asn1/s1ap/s1ap.cnf" +#line 1780 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", KillRequest "); offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, @@ -9657,10 +9715,9 @@ 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 1732 "./asn1/s1ap/s1ap.cnf" +#line 1782 "./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); @@ -9675,6 +9732,9 @@ static const per_sequence_t PWSRestartIndication_sequence[] = { static int dissect_s1ap_PWSRestartIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1784 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", PWSRestartIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PWSRestartIndication, PWSRestartIndication_sequence); @@ -9689,13 +9749,9 @@ static const per_sequence_t PWSFailureIndication_sequence[] = { static int dissect_s1ap_PWSFailureIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1768 "./asn1/s1ap/s1ap.cnf" +#line 1786 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", PWSFailureIndication "); - -/* Whenever a Cause appears, look up the reason and show it in the Info column */ - - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_PWSFailureIndication, PWSFailureIndication_sequence); @@ -9710,10 +9766,9 @@ static const per_sequence_t DownlinkUEAssociatedLPPaTransport_sequence[] = { static int dissect_s1ap_DownlinkUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1735 "./asn1/s1ap/s1ap.cnf" +#line 1788 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkUEAssociatedLPPaTransport "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_DownlinkUEAssociatedLPPaTransport, DownlinkUEAssociatedLPPaTransport_sequence); @@ -9728,10 +9783,9 @@ static const per_sequence_t UplinkUEAssociatedLPPaTransport_sequence[] = { static int dissect_s1ap_UplinkUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1738 "./asn1/s1ap/s1ap.cnf" +#line 1790 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkUEAssociatedLPPaTransport "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UplinkUEAssociatedLPPaTransport, UplinkUEAssociatedLPPaTransport_sequence); @@ -9746,10 +9800,9 @@ static const per_sequence_t DownlinkNonUEAssociatedLPPaTransport_sequence[] = { static int dissect_s1ap_DownlinkNonUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1741 "./asn1/s1ap/s1ap.cnf" +#line 1792 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", DownlinkNonUEAssociatedLPPaTransport "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_DownlinkNonUEAssociatedLPPaTransport, DownlinkNonUEAssociatedLPPaTransport_sequence); @@ -9764,10 +9817,9 @@ static const per_sequence_t UplinkNonUEAssociatedLPPaTransport_sequence[] = { static int dissect_s1ap_UplinkNonUEAssociatedLPPaTransport(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1744 "./asn1/s1ap/s1ap.cnf" +#line 1794 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UplinkNonUEAssociatedLPPaTransport "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UplinkNonUEAssociatedLPPaTransport, UplinkNonUEAssociatedLPPaTransport_sequence); @@ -9782,10 +9834,9 @@ static const per_sequence_t E_RABModificationIndication_sequence[] = { static int dissect_s1ap_E_RABModificationIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1753 "./asn1/s1ap/s1ap.cnf" +#line 1796 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationIndication "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABModificationIndication, E_RABModificationIndication_sequence); @@ -9870,10 +9921,9 @@ static const per_sequence_t E_RABModificationConfirm_sequence[] = { static int dissect_s1ap_E_RABModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1756 "./asn1/s1ap/s1ap.cnf" +#line 1798 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", E-RABModificationConfirm "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_E_RABModificationConfirm, E_RABModificationConfirm_sequence); @@ -9917,10 +9967,9 @@ static const per_sequence_t UEContextModificationIndication_sequence[] = { static int dissect_s1ap_UEContextModificationIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1759 "./asn1/s1ap/s1ap.cnf" +#line 1800 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationIndication "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextModificationIndication, UEContextModificationIndication_sequence); @@ -9935,10 +9984,9 @@ static const per_sequence_t UEContextModificationConfirm_sequence[] = { static int dissect_s1ap_UEContextModificationConfirm(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 1762 "./asn1/s1ap/s1ap.cnf" +#line 1802 "./asn1/s1ap/s1ap.cnf" col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextModificationConfirm "); - offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextModificationConfirm, UEContextModificationConfirm_sequence); @@ -9953,6 +10001,9 @@ static const per_sequence_t UEContextSuspendRequest_sequence[] = { static int dissect_s1ap_UEContextSuspendRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1804 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextSuspendRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextSuspendRequest, UEContextSuspendRequest_sequence); @@ -9967,6 +10018,9 @@ static const per_sequence_t UEContextSuspendResponse_sequence[] = { static int dissect_s1ap_UEContextSuspendResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1806 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextSuspendResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextSuspendResponse, UEContextSuspendResponse_sequence); @@ -9981,6 +10035,9 @@ static const per_sequence_t UEContextResumeRequest_sequence[] = { static int dissect_s1ap_UEContextResumeRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1808 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeRequest "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextResumeRequest, UEContextResumeRequest_sequence); @@ -10020,6 +10077,9 @@ static const per_sequence_t UEContextResumeResponse_sequence[] = { static int dissect_s1ap_UEContextResumeResponse(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1810 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeResponse "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextResumeResponse, UEContextResumeResponse_sequence); @@ -10059,6 +10119,9 @@ static const per_sequence_t UEContextResumeFailure_sequence[] = { static int dissect_s1ap_UEContextResumeFailure(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1812 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", UEContextResumeFailure "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_UEContextResumeFailure, UEContextResumeFailure_sequence); @@ -10073,6 +10136,9 @@ static const per_sequence_t ConnectionEstablishmentIndication_sequence[] = { static int dissect_s1ap_ConnectionEstablishmentIndication(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { +#line 1814 "./asn1/s1ap/s1ap.cnf" + col_append_str(actx->pinfo->cinfo, COL_INFO, ", ConnectionEstablishmentIndication "); + offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_s1ap_ConnectionEstablishmentIndication, ConnectionEstablishmentIndication_sequence);