diff --git a/src/amf/ngap-build.c b/src/amf/ngap-build.c index ba78671b3..a0376bcfd 100644 --- a/src/amf/ngap-build.c +++ b/src/amf/ngap-build.c @@ -33,6 +33,8 @@ ogs_pkbuf_t *ngap_build_ng_setup_response(void) NGAP_RelativeAMFCapacity_t *RelativeAMFCapacity = NULL; NGAP_PLMNSupportList_t *PLMNSupportList = NULL; + ogs_debug("NGSetupResponse"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome; pdu.choice.successfulOutcome = @@ -384,7 +386,7 @@ ogs_pkbuf_t *ngap_ue_build_initial_context_setup_request( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); - ogs_debug("Initial context setup request"); + ogs_debug("InitialContextSetupRequest(UE)"); memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; @@ -694,7 +696,7 @@ ogs_pkbuf_t *ngap_sess_build_initial_context_setup_request( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); - ogs_debug("Initial context setup request"); + ogs_debug("InitialContextSetupRequest(Session)"); memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; @@ -1113,6 +1115,8 @@ ogs_pkbuf_t *ngap_build_ue_context_release_command( ogs_assert(ran_ue); + ogs_debug("UEContextReleaseCommand"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t)); @@ -1187,6 +1191,8 @@ ogs_pkbuf_t *ngap_ue_build_pdu_session_resource_setup_request( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); + ogs_debug("PDUSessionResourceSetupRequest(UE)"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t)); @@ -1319,6 +1325,8 @@ ogs_pkbuf_t *ngap_sess_build_pdu_session_resource_setup_request( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); + ogs_debug("PDUSessionResourceSetupRequest(Session)"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t)); @@ -1429,6 +1437,8 @@ ogs_pkbuf_t *ngap_build_pdu_session_resource_modify_request( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); + ogs_debug("PDUSessionResourceModifyRequest"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t)); @@ -1526,6 +1536,8 @@ ogs_pkbuf_t *ngap_build_pdu_session_resource_release_command( ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); + ogs_debug("PDUSessionResourceReleaseCommand"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(NGAP_InitiatingMessage_t)); @@ -1750,6 +1762,8 @@ ogs_pkbuf_t *ngap_build_path_switch_ack(amf_ue_t *amf_ue) ran_ue = ran_ue_cycle(amf_ue->ran_ue); ogs_assert(ran_ue); + ogs_debug("PathSwitchAcknowledge"); + memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome; pdu.choice.successfulOutcome = CALLOC(1, sizeof(NGAP_SuccessfulOutcome_t)); @@ -1918,7 +1932,7 @@ ogs_pkbuf_t *ngap_build_handover_request(ran_ue_t *target_ue) amf_ue = target_ue->amf_ue; ogs_assert(amf_ue); - ogs_debug("Handover request"); + ogs_debug("HandoverRequest"); memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage; @@ -2300,7 +2314,7 @@ ogs_pkbuf_t *ngap_build_handover_command(ran_ue_t *source_ue) amf_ue = source_ue->amf_ue; ogs_assert(amf_ue); - ogs_debug("Handover command"); + ogs_debug("HandoverCommand"); memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome; @@ -2415,7 +2429,7 @@ ogs_pkbuf_t *ngap_build_handover_cancel_ack(ran_ue_t *source_ue) ogs_assert(source_ue); - ogs_debug("Handover cancel"); + ogs_debug("HandoverCancelAcknowledge"); memset(&pdu, 0, sizeof (NGAP_NGAP_PDU_t)); pdu.present = NGAP_NGAP_PDU_PR_successfulOutcome; diff --git a/src/amf/ngap-handler.c b/src/amf/ngap-handler.c index b765b8bdd..4677f4c16 100644 --- a/src/amf/ngap-handler.c +++ b/src/amf/ngap-handler.c @@ -124,7 +124,7 @@ void ngap_handle_ng_setup_request(amf_gnb_t *gnb, ogs_ngap_message_t *message) NGSetupRequest = &initiatingMessage->value.choice.NGSetupRequest; ogs_assert(NGSetupRequest); - ogs_debug("NG-Setup request"); + ogs_debug("NGSetupRequest"); for (i = 0; i < NGSetupRequest->protocolIEs.list.count; i++) { ie = NGSetupRequest->protocolIEs.list.array[i]; @@ -346,7 +346,7 @@ void ngap_handle_initial_ue_message(amf_gnb_t *gnb, ogs_ngap_message_t *message) InitialUEMessage = &initiatingMessage->value.choice.InitialUEMessage; ogs_assert(InitialUEMessage); - ogs_info("Initial UE Message"); + ogs_info("InitialUEMessage"); for (i = 0; i < InitialUEMessage->protocolIEs.list.count; i++) { ie = InitialUEMessage->protocolIEs.list.array[i]; @@ -520,7 +520,7 @@ void ngap_handle_uplink_nas_transport( UplinkNASTransport = &initiatingMessage->value.choice.UplinkNASTransport; ogs_assert(UplinkNASTransport); - ogs_debug("Uplink NAS transport"); + ogs_debug("UplinkNASTransport"); for (i = 0; i < UplinkNASTransport->protocolIEs.list.count; i++) { ie = UplinkNASTransport->protocolIEs.list.array[i]; @@ -654,7 +654,7 @@ void ngap_handle_ue_radio_capability_info_indication( &initiatingMessage->value.choice.UERadioCapabilityInfoIndication; ogs_assert(UERadioCapabilityInfoIndication); - ogs_debug("UE radio capability info indication"); + ogs_debug("UERadioCapabilityInfoIndication"); for (i = 0; i < UERadioCapabilityInfoIndication->protocolIEs.list.count; i++) { @@ -750,7 +750,7 @@ void ngap_handle_initial_context_setup_response( &successfulOutcome->value.choice.InitialContextSetupResponse; ogs_assert(InitialContextSetupResponse); - ogs_debug("Initial context setup response"); + ogs_debug("InitialContextSetupResponse"); for (i = 0; i < InitialContextSetupResponse->protocolIEs.list.count; i++) { ie = InitialContextSetupResponse->protocolIEs.list.array[i]; @@ -905,7 +905,7 @@ void ngap_handle_initial_context_setup_failure( &unsuccessfulOutcome->value.choice.InitialContextSetupFailure; ogs_assert(InitialContextSetupFailure); - ogs_debug("Initial context setup failure"); + ogs_debug("InitialContextSetupFailure"); for (i = 0; i < InitialContextSetupFailure->protocolIEs.list.count; i++) { ie = InitialContextSetupFailure->protocolIEs.list.array[i]; @@ -1025,7 +1025,7 @@ void ngap_handle_ue_context_release_request( &initiatingMessage->value.choice.UEContextReleaseRequest; ogs_assert(UEContextReleaseRequest); - ogs_debug("UE Context release request"); + ogs_debug("UEContextReleaseRequest"); for (i = 0; i < UEContextReleaseRequest->protocolIEs.list.count; i++) { ie = UEContextReleaseRequest->protocolIEs.list.array[i]; @@ -1183,7 +1183,7 @@ void ngap_handle_ue_context_release_complete( &successfulOutcome->value.choice.UEContextReleaseComplete; ogs_assert(UEContextReleaseComplete); - ogs_debug("UE Context release complete"); + ogs_debug("UEContextReleaseComplete"); for (i = 0; i < UEContextReleaseComplete->protocolIEs.list.count; i++) { ie = UEContextReleaseComplete->protocolIEs.list.array[i]; @@ -1331,7 +1331,7 @@ void ngap_handle_pdu_session_resource_setup_response( &successfulOutcome->value.choice.PDUSessionResourceSetupResponse; ogs_assert(PDUSessionResourceSetupResponse); - ogs_debug("PDU session resource setup response"); + ogs_debug("PDUSessionResourceSetupResponse"); for (i = 0; i < PDUSessionResourceSetupResponse->protocolIEs.list.count; i++) { @@ -1494,7 +1494,7 @@ void ngap_handle_pdu_session_resource_modify_response( &successfulOutcome->value.choice.PDUSessionResourceModifyResponse; ogs_assert(PDUSessionResourceModifyResponse); - ogs_debug("PDU session resource modify response"); + ogs_debug("PDUSessionResourceModifyResponse"); for (i = 0; i < PDUSessionResourceModifyResponse->protocolIEs.list.count; i++) { @@ -1658,7 +1658,7 @@ void ngap_handle_pdu_session_resource_release_response( &successfulOutcome->value.choice.PDUSessionResourceReleaseResponse; ogs_assert(PDUSessionResourceReleaseResponse); - ogs_debug("PDU session resource release response"); + ogs_debug("PDUSessionResourceReleaseResponse"); for (i = 0; i < PDUSessionResourceReleaseResponse->protocolIEs.list.count; i++) { @@ -1813,7 +1813,7 @@ void ngap_handle_uplink_ran_configuration_transfer( &initiatingMessage->value.choice.UplinkRANConfigurationTransfer; ogs_assert(UplinkRANConfigurationTransfer); - ogs_debug("Uplink ran configuration transfer"); + ogs_debug("UplinkRANConfigurationTransfer"); for (i = 0; i < UplinkRANConfigurationTransfer->protocolIEs.list.count; i++) { ie = UplinkRANConfigurationTransfer->protocolIEs.list.array[i]; @@ -1952,7 +1952,7 @@ void ngap_handle_path_switch_request( PathSwitchRequest = &initiatingMessage->value.choice.PathSwitchRequest; ogs_assert(PathSwitchRequest); - ogs_info("Path switch request"); + ogs_info("PathSwitchRequest"); for (i = 0; i < PathSwitchRequest->protocolIEs.list.count; i++) { ie = PathSwitchRequest->protocolIEs.list.array[i]; @@ -2226,7 +2226,7 @@ void ngap_handle_handover_required( HandoverRequired = &initiatingMessage->value.choice.HandoverRequired; ogs_assert(HandoverRequired); - ogs_info("Handover required"); + ogs_info("HandoverRequired"); for (i = 0; i < HandoverRequired->protocolIEs.list.count; i++) { ie = HandoverRequired->protocolIEs.list.array[i]; @@ -2507,7 +2507,7 @@ void ngap_handle_handover_request_ack( &successfulOutcome->value.choice.HandoverRequestAcknowledge; ogs_assert(HandoverRequestAcknowledge); - ogs_debug("Handover request acknowledge"); + ogs_debug("HandoverRequestAcknowledge"); for (i = 0; i < HandoverRequestAcknowledge->protocolIEs.list.count; i++) { ie = HandoverRequestAcknowledge->protocolIEs.list.array[i]; @@ -2701,7 +2701,7 @@ void ngap_handle_handover_failure( &unsuccessfulOutcome->value.choice.HandoverFailure; ogs_assert(HandoverFailure); - ogs_debug("Initial context setup failure"); + ogs_debug("HandoverFailure"); for (i = 0; i < HandoverFailure->protocolIEs.list.count; i++) { ie = HandoverFailure->protocolIEs.list.array[i]; @@ -2808,7 +2808,7 @@ void ngap_handle_handover_cancel( HandoverCancel = &initiatingMessage->value.choice.HandoverCancel; ogs_assert(HandoverCancel); - ogs_debug("Handover cancel"); + ogs_debug("HandoverCancel"); for (i = 0; i < HandoverCancel->protocolIEs.list.count; i++) { ie = HandoverCancel->protocolIEs.list.array[i]; @@ -2933,7 +2933,7 @@ void ngap_handle_uplink_ran_status_transfer( &initiatingMessage->value.choice.UplinkRANStatusTransfer; ogs_assert(UplinkRANStatusTransfer); - ogs_debug("Uplink ran status transfer"); + ogs_debug("UplinkRANStatusTransfer"); for (i = 0; i < UplinkRANStatusTransfer->protocolIEs.list.count; i++) { ie = UplinkRANStatusTransfer->protocolIEs.list.array[i]; @@ -3042,7 +3042,7 @@ void ngap_handle_handover_notification( HandoverNotify = &initiatingMessage->value.choice.HandoverNotify; ogs_assert(HandoverNotify); - ogs_debug("Handover notify"); + ogs_debug("HandoverNotify"); for (i = 0; i < HandoverNotify->protocolIEs.list.count; i++) { ie = HandoverNotify->protocolIEs.list.array[i]; diff --git a/src/mme/s1ap-build.c b/src/mme/s1ap-build.c index ba08ed0dd..d7c9d358f 100644 --- a/src/mme/s1ap-build.c +++ b/src/mme/s1ap-build.c @@ -35,6 +35,8 @@ ogs_pkbuf_t *s1ap_build_setup_rsp(void) S1AP_RelativeMMECapacity_t *RelativeMMECapacity = NULL; S1AP_MMEname_t *MMEname = NULL; + ogs_debug("S1SetupResponse"); + memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome; pdu.choice.successfulOutcome = @@ -139,6 +141,8 @@ ogs_pkbuf_t *s1ap_build_setup_failure( S1AP_S1SetupFailureIEs_t *ie = NULL; S1AP_Cause_t *Cause = NULL; S1AP_TimeToWait_t *TimeToWait = NULL; + + ogs_debug("S1SetupFailure"); ogs_debug(" Group[%d] Cause[%d] TimeToWait[%ld]", group, (int)cause, time_to_wait); @@ -287,7 +291,7 @@ ogs_pkbuf_t *s1ap_build_initial_context_setup_request( subscription_data = &mme_ue->subscription_data; ogs_assert(subscription_data); - ogs_debug("Initial context setup request"); + ogs_debug("InitialContextSetupRequest"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -647,7 +651,7 @@ ogs_pkbuf_t *s1ap_build_ue_context_modification_request(mme_ue_t *mme_ue) enb_ue = enb_ue_cycle(mme_ue->enb_ue); ogs_assert(enb_ue); - ogs_debug("UE context modification request"); + ogs_debug("UEContextModificationRequest"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -785,6 +789,8 @@ ogs_pkbuf_t *s1ap_build_ue_context_release_command( return NULL; } + ogs_debug("UEContextReleaseCommand"); + memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(S1AP_InitiatingMessage_t)); @@ -866,6 +872,8 @@ ogs_pkbuf_t *s1ap_build_e_rab_setup_request( enb_ue = enb_ue_cycle(mme_ue->enb_ue); ogs_assert(enb_ue); + ogs_debug("E-RABSetupRequest"); + memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(S1AP_InitiatingMessage_t)); @@ -997,7 +1005,8 @@ ogs_pkbuf_t *s1ap_build_e_rab_modify_request( enb_ue = enb_ue_cycle(mme_ue->enb_ue); ogs_assert(enb_ue); - ogs_debug("E-RAB modify request"); + ogs_debug("E-RABModifyRequest"); + memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; pdu.choice.initiatingMessage = CALLOC(1, sizeof(S1AP_InitiatingMessage_t)); @@ -1127,7 +1136,7 @@ ogs_pkbuf_t *s1ap_build_e_rab_release_command( subscription_data = &mme_ue->subscription_data; ogs_assert(subscription_data); - ogs_debug("E-RAB release command"); + ogs_debug("E-RABReleaseCommand"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -1363,7 +1372,7 @@ ogs_pkbuf_t *s1ap_build_mme_configuration_transfer( ogs_assert(son_configuration_transfer); - ogs_debug("MME Configuration Transfer"); + ogs_debug("MMEConfigurationTransfer"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -1413,7 +1422,7 @@ ogs_pkbuf_t *s1ap_build_path_switch_ack(mme_ue_t *mme_ue) enb_ue = enb_ue_cycle(mme_ue->enb_ue); ogs_assert(enb_ue); - ogs_debug("Path switch acknowledge"); + ogs_debug("PathSwitchAcknowledge"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome; @@ -1490,7 +1499,7 @@ ogs_pkbuf_t *s1ap_build_path_switch_failure( S1AP_ENB_UE_S1AP_ID_t *ENB_UE_S1AP_ID = NULL; S1AP_Cause_t *Cause = NULL; - ogs_debug("Path switch failure"); + ogs_debug("PathSwitchFailure"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_unsuccessfulOutcome; @@ -1572,7 +1581,7 @@ ogs_pkbuf_t *s1ap_build_handover_command(enb_ue_t *source_ue) ogs_assert(source_ue); mme_ue = source_ue->mme_ue; - ogs_debug("Handover command"); + ogs_debug("HandoverCommand"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome; @@ -1730,7 +1739,7 @@ ogs_pkbuf_t *s1ap_build_handover_preparation_failure( ogs_assert(source_ue); ogs_assert(cause); - ogs_debug("Handover preparation failure"); + ogs_debug("HandoverPreparationFailure"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_unsuccessfulOutcome; @@ -1827,7 +1836,7 @@ ogs_pkbuf_t *s1ap_build_handover_request( subscription_data = &mme_ue->subscription_data; ogs_assert(subscription_data); - ogs_debug("Handover request"); + ogs_debug("HandoverRequest"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -2059,7 +2068,7 @@ ogs_pkbuf_t *s1ap_build_handover_cancel_ack(enb_ue_t *source_ue) ogs_assert(source_ue); - ogs_debug("Handover cancel acknowledge"); + ogs_debug("HandoverCancelAcknowledge"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_successfulOutcome; @@ -2124,7 +2133,7 @@ ogs_pkbuf_t *s1ap_build_mme_status_transfer( ogs_assert(target_ue); ogs_assert(enb_statustransfer_transparentContainer); - ogs_debug("MME status transfer"); + ogs_debug("MMEStatusTransfer"); memset(&pdu, 0, sizeof (S1AP_S1AP_PDU_t)); pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage; @@ -2196,7 +2205,7 @@ ogs_pkbuf_t *s1ap_build_write_replace_warning_request(sbc_pws_data_t *sbc_pws) S1AP_DataCodingScheme_t *DataCodingScheme = NULL; S1AP_WarningMessageContents_t *WarningMessageContents = NULL; - ogs_debug("Write-replace warning request"); + ogs_debug("WriteReplaceWarningRequest"); ogs_assert(sbc_pws); @@ -2333,7 +2342,7 @@ ogs_pkbuf_t *s1ap_build_kill_request(sbc_pws_data_t *sbc_pws) S1AP_MessageIdentifier_t *MessageIdentifier = NULL; S1AP_SerialNumber_t *SerialNumber = NULL; - ogs_debug("Kill request"); + ogs_debug("KillRequest"); ogs_assert(sbc_pws); diff --git a/src/mme/s1ap-handler.c b/src/mme/s1ap-handler.c index c2ef876b2..1ff9d5354 100644 --- a/src/mme/s1ap-handler.c +++ b/src/mme/s1ap-handler.c @@ -90,7 +90,7 @@ void s1ap_handle_s1_setup_request(mme_enb_t *enb, ogs_s1ap_message_t *message) S1SetupRequest = &initiatingMessage->value.choice.S1SetupRequest; ogs_assert(S1SetupRequest); - ogs_debug("S1-Setup request"); + ogs_debug("S1SetupRequest"); for (i = 0; i < S1SetupRequest->protocolIEs.list.count; i++) { ie = S1SetupRequest->protocolIEs.list.array[i]; @@ -220,7 +220,7 @@ void s1ap_handle_initial_ue_message(mme_enb_t *enb, ogs_s1ap_message_t *message) InitialUEMessage = &initiatingMessage->value.choice.InitialUEMessage; ogs_assert(InitialUEMessage); - ogs_info("Initial UE Message"); + ogs_info("InitialUEMessage"); for (i = 0; i < InitialUEMessage->protocolIEs.list.count; i++) { ie = InitialUEMessage->protocolIEs.list.array[i]; @@ -394,7 +394,7 @@ void s1ap_handle_uplink_nas_transport( UplinkNASTransport = &initiatingMessage->value.choice.UplinkNASTransport; ogs_assert(UplinkNASTransport); - ogs_debug("Uplink NAS transport"); + ogs_debug("UplinkNASTransport"); for (i = 0; i < UplinkNASTransport->protocolIEs.list.count; i++) { ie = UplinkNASTransport->protocolIEs.list.array[i]; @@ -531,7 +531,7 @@ void s1ap_handle_ue_capability_info_indication( &initiatingMessage->value.choice.UECapabilityInfoIndication; ogs_assert(UECapabilityInfoIndication); - ogs_debug("UE capability info indication"); + ogs_debug("UECapabilityInfoIndication"); for (i = 0; i < UECapabilityInfoIndication->protocolIEs.list.count; i++) { ie = UECapabilityInfoIndication->protocolIEs.list.array[i]; @@ -591,7 +591,7 @@ void s1ap_handle_initial_context_setup_response( &successfulOutcome->value.choice.InitialContextSetupResponse; ogs_assert(InitialContextSetupResponse); - ogs_debug("Initial context setup response"); + ogs_debug("InitialContextSetupResponse"); for (i = 0; i < InitialContextSetupResponse->protocolIEs.list.count; i++) { ie = InitialContextSetupResponse->protocolIEs.list.array[i]; @@ -729,7 +729,7 @@ void s1ap_handle_initial_context_setup_failure( &unsuccessfulOutcome->value.choice.InitialContextSetupFailure; ogs_assert(InitialContextSetupFailure); - ogs_debug("Initial context setup failure"); + ogs_debug("InitialContextSetupFailure"); for (i = 0; i < InitialContextSetupFailure->protocolIEs.list.count; i++) { ie = InitialContextSetupFailure->protocolIEs.list.array[i]; @@ -817,7 +817,7 @@ void s1ap_handle_ue_context_modification_response( &successfulOutcome->value.choice.UEContextModificationResponse; ogs_assert(UEContextModificationResponse); - ogs_debug("UE context modification response"); + ogs_debug("UEContextModificationResponse"); for (i = 0; i < UEContextModificationResponse->protocolIEs.list.count; i++) { @@ -887,7 +887,7 @@ void s1ap_handle_ue_context_modification_failure( &unsuccessfulOutcome->value.choice.UEContextModificationFailure; ogs_assert(UEContextModificationFailure); - ogs_warn("UE context modification failure"); + ogs_warn("UEContextModificationFailure"); for (i = 0; i < UEContextModificationFailure->protocolIEs.list.count; i++) { ie = UEContextModificationFailure->protocolIEs.list.array[i]; @@ -964,7 +964,7 @@ void s1ap_handle_e_rab_setup_response( E_RABSetupResponse = &successfulOutcome->value.choice.E_RABSetupResponse; ogs_assert(E_RABSetupResponse); - ogs_debug("E-RAB setup response"); + ogs_debug("E-RABSetupResponse"); for (i = 0; i < E_RABSetupResponse->protocolIEs.list.count; i++) { ie = E_RABSetupResponse->protocolIEs.list.array[i]; @@ -1092,7 +1092,7 @@ void s1ap_handle_ue_context_release_request( &initiatingMessage->value.choice.UEContextReleaseRequest; ogs_assert(UEContextReleaseRequest); - ogs_debug("UE Context release request"); + ogs_debug("UEContextReleaseRequest"); for (i = 0; i < UEContextReleaseRequest->protocolIEs.list.count; i++) { ie = UEContextReleaseRequest->protocolIEs.list.array[i]; @@ -1180,7 +1180,7 @@ void s1ap_handle_ue_context_release_complete( &successfulOutcome->value.choice.UEContextReleaseComplete; ogs_assert(UEContextReleaseComplete); - ogs_debug("UE Context release complete"); + ogs_debug("UEContextReleaseComplete"); for (i = 0; i < UEContextReleaseComplete->protocolIEs.list.count; i++) { ie = UEContextReleaseComplete->protocolIEs.list.array[i]; @@ -1356,7 +1356,7 @@ void s1ap_handle_path_switch_request( PathSwitchRequest = &initiatingMessage->value.choice.PathSwitchRequest; ogs_assert(PathSwitchRequest); - ogs_info("Path switch request"); + ogs_info("PathSwitchRequest"); for (i = 0; i < PathSwitchRequest->protocolIEs.list.count; i++) { ie = PathSwitchRequest->protocolIEs.list.array[i]; @@ -1550,7 +1550,7 @@ void s1ap_handle_enb_configuration_transfer( &initiatingMessage->value.choice.ENBConfigurationTransfer; ogs_assert(ENBConfigurationTransfer); - ogs_debug("ENB configuration transfer"); + ogs_debug("ENBConfigurationTransfer"); for (i = 0; i < ENBConfigurationTransfer->protocolIEs.list.count; i++) { ie = ENBConfigurationTransfer->protocolIEs.list.array[i]; switch (ie->id) { @@ -1644,7 +1644,7 @@ void s1ap_handle_handover_required(mme_enb_t *enb, ogs_s1ap_message_t *message) mme_enb_t *target_enb = NULL; uint32_t target_enb_id = 0; - ogs_debug("Handover required"); + ogs_debug("HandoverRequired"); for (i = 0; i < HandoverRequired->protocolIEs.list.count; i++) { ie = HandoverRequired->protocolIEs.list.array[i]; switch (ie->id) { @@ -1756,7 +1756,7 @@ void s1ap_handle_handover_request_ack( &successfulOutcome->value.choice.HandoverRequestAcknowledge; ogs_assert(HandoverRequestAcknowledge); - ogs_debug("Handover request acknowledge"); + ogs_debug("HandoverRequestAcknowledge"); for (i = 0; i < HandoverRequestAcknowledge->protocolIEs.list.count; i++) { ie = HandoverRequestAcknowledge->protocolIEs.list.array[i]; switch (ie->id) { @@ -1880,7 +1880,7 @@ void s1ap_handle_handover_failure(mme_enb_t *enb, ogs_s1ap_message_t *message) HandoverFailure = &unsuccessfulOutcome->value.choice.HandoverFailure; ogs_assert(HandoverFailure); - ogs_debug("Handover failure"); + ogs_debug("HandoverFailure"); for (i = 0; i < HandoverFailure->protocolIEs.list.count; i++) { ie = HandoverFailure->protocolIEs.list.array[i]; switch (ie->id) { @@ -1945,7 +1945,7 @@ void s1ap_handle_handover_cancel(mme_enb_t *enb, ogs_s1ap_message_t *message) HandoverCancel = &initiatingMessage->value.choice.HandoverCancel; ogs_assert(HandoverCancel); - ogs_debug("Handover cancel"); + ogs_debug("HandoverCancel"); for (i = 0; i < HandoverCancel->protocolIEs.list.count; i++) { ie = HandoverCancel->protocolIEs.list.array[i]; switch (ie->id) { @@ -2017,7 +2017,7 @@ void s1ap_handle_enb_status_transfer(mme_enb_t *enb, ogs_s1ap_message_t *message ENBStatusTransfer = &initiatingMessage->value.choice.ENBStatusTransfer; ogs_assert(ENBStatusTransfer); - ogs_debug("ENB status transfer"); + ogs_debug("ENBStatusTransfer"); for (i = 0; i < ENBStatusTransfer->protocolIEs.list.count; i++) { ie = ENBStatusTransfer->protocolIEs.list.array[i]; switch (ie->id) { @@ -2092,7 +2092,7 @@ void s1ap_handle_handover_notification( HandoverNotify = &initiatingMessage->value.choice.HandoverNotify; ogs_assert(HandoverNotify); - ogs_debug("Handover notification"); + ogs_debug("HandoverNotify"); for (i = 0; i < HandoverNotify->protocolIEs.list.count; i++) { ie = HandoverNotify->protocolIEs.list.array[i]; switch (ie->id) { @@ -2376,7 +2376,7 @@ void s1ap_handle_write_replace_warning_response( &successfulOutcome->value.choice.WriteReplaceWarningResponse; ogs_assert(WriteReplaceWarningResponse); - ogs_debug("Write replace warning response"); + ogs_debug("WriteReplaceWarningResponse"); ogs_debug(" IP[%s] ENB_ID[%d]", OGS_ADDR(enb->sctp.addr, buf), enb->enb_id); @@ -2401,7 +2401,7 @@ void s1ap_handle_kill_response( &successfulOutcome->value.choice.KillResponse; ogs_assert(KillResponse); - ogs_debug("Kill response"); + ogs_debug("KillResponse"); ogs_debug(" IP[%s] ENB_ID[%d]", OGS_ADDR(enb->sctp.addr, buf), enb->enb_id); diff --git a/src/smf/ngap-handler.c b/src/smf/ngap-handler.c index a93adb6e3..6cc737a60 100644 --- a/src/smf/ngap-handler.c +++ b/src/smf/ngap-handler.c @@ -49,6 +49,8 @@ int ngap_handle_pdu_session_resource_setup_response_transfer( smf_ue = sess->smf_ue; ogs_assert(smf_ue); + ogs_debug("PDUSessionResourceSetupResponseTransfer"); + rv = ogs_asn_decode( &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, &message, sizeof(message), pkbuf); @@ -171,6 +173,8 @@ int ngap_handle_pdu_session_resource_modify_response_transfer( smf_ue = sess->smf_ue; ogs_assert(smf_ue); + ogs_debug("PDUSessionResourceModifyResponseTransfer"); + rv = ogs_asn_decode( &asn_DEF_NGAP_PDUSessionResourceModifyResponseTransfer, &message, sizeof(message), pkbuf); @@ -256,6 +260,8 @@ int ngap_handle_path_switch_request_transfer( smf_ue = sess->smf_ue; ogs_assert(smf_ue); + ogs_debug("PathSwitchRequestTransfer"); + rv = ogs_asn_decode(&asn_DEF_NGAP_PathSwitchRequestTransfer, &message, sizeof(message), pkbuf); if (rv != OGS_OK) { @@ -372,6 +378,8 @@ int ngap_handle_handover_required_transfer( smf_ue = sess->smf_ue; ogs_assert(smf_ue); + ogs_debug("HandoverRequiredTransfer"); + rv = ogs_asn_decode(&asn_DEF_NGAP_HandoverRequiredTransfer, &message, sizeof(message), pkbuf); if (rv != OGS_OK) { @@ -425,6 +433,8 @@ int ngap_handle_handover_request_ack( smf_ue = sess->smf_ue; ogs_assert(smf_ue); + ogs_debug("HandoverRequestAcknowledgeTransfer"); + rv = ogs_asn_decode(&asn_DEF_NGAP_HandoverRequestAcknowledgeTransfer, &message, sizeof(message), pkbuf); if (rv != OGS_OK) {