From ab2c1cd10f366e3c0f7ee6c6d78d63b7b67d7ca7 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 19 Apr 2018 18:21:27 +0200 Subject: [PATCH] fix typos in s1ap in EPC --- srsepc/src/mme/s1ap_ctx_mngmt_proc.cc | 4 ++-- srsepc/src/mme/s1ap_nas_transport.cc | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc index a509b8a70..2ba49ae01 100644 --- a/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc +++ b/srsepc/src/mme/s1ap_ctx_mngmt_proc.cc @@ -283,8 +283,8 @@ s1ap_ctx_mngmt_proc::handle_ue_context_release_request(LIBLTE_S1AP_MESSAGE_UECON if (ecm_ctx->state == ECM_STATE_CONNECTED) { //There are active E-RABs, send release access mearers request - m_s1ap_log->console("There are active E-RABs, send release access mearers request"); - m_s1ap_log->info("There are active E-RABs, send release access mearers request"); + m_s1ap_log->console("There are active E-RABs, send release access mearers request\n"); + m_s1ap_log->info("There are active E-RABs, send release access mearers request\n"); //The handle_release_access_bearers_response function will make sure to mark E-RABS DEACTIVATED //It will release the UEs downstream S1-u and keep the upstream S1-U connection active. diff --git a/srsepc/src/mme/s1ap_nas_transport.cc b/srsepc/src/mme/s1ap_nas_transport.cc index 4487f3c9a..c918de3f3 100644 --- a/srsepc/src/mme/s1ap_nas_transport.cc +++ b/srsepc/src/mme/s1ap_nas_transport.cc @@ -284,7 +284,7 @@ s1ap_nas_transport::handle_uplink_nas_transport(LIBLTE_S1AP_MESSAGE_UPLINKNASTRA } else if(sec_hdr_type == LIBLTE_MME_SECURITY_HDR_TYPE_INTEGRITY || sec_hdr_type == LIBLTE_MME_SECURITY_HDR_TYPE_INTEGRITY_AND_CIPHERED) { - //Integrity protected NAS message, possibly chiphered. + //Integrity protected NAS message, possibly ciphered. emm_ctx->security_ctxt.ul_nas_count++; mac_valid = integrity_check(emm_ctx,nas_msg); if(!mac_valid){ @@ -1145,8 +1145,8 @@ s1ap_nas_transport::handle_esm_information_response(srslte::byte_buffer_t *nas_m m_s1ap_log->info("ESM Info: EPS bearer id %d\n",esm_info_resp.eps_bearer_id); if(esm_info_resp.apn_present) { - m_s1ap_log->info("ESM Info: APN %d\n",esm_info_resp.eps_bearer_id); - m_s1ap_log->console("ESM Info: APN %d\n",esm_info_resp.eps_bearer_id); + m_s1ap_log->info("ESM Info: APN %s\n",esm_info_resp.apn.apn.c_str()); + m_s1ap_log->console("ESM Info: APN %s\n",esm_info_resp.apn.apn.c_str()); } if(esm_info_resp.protocol_cnfg_opts_present) { @@ -1683,10 +1683,10 @@ s1ap_nas_transport::pack_esm_information_request(srslte::byte_buffer_t *reply_ms dw_nas->SubscriberProfileIDforRFP_present=false; LIBLTE_MME_ESM_INFORMATION_REQUEST_MSG_STRUCT esm_info_req; - esm_info_req.eps_bearer_id=0; + esm_info_req.eps_bearer_id = 0; esm_info_req.proc_transaction_id = ue_emm_ctx->procedure_transaction_id; - uint8_t sec_hdr_type=2; + uint8_t sec_hdr_type = LIBLTE_MME_SECURITY_HDR_TYPE_INTEGRITY_AND_CIPHERED; ue_emm_ctx->security_ctxt.dl_nas_count++;