From b1f4ee47d1bbb9b1e05a3923e879470521073fed Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 26 Mar 2018 11:58:35 +0100 Subject: [PATCH] Temporally removed unhandled UE cap info. --- srsepc/hdr/mme/s1ap.h | 2 - srsepc/hdr/mme/s1ap_ue_cap_info.h | 58 ---------------------- srsepc/src/mme/s1ap.cc | 10 +--- srsepc/src/mme/s1ap_ue_cap_info.cc | 78 ------------------------------ 4 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 srsepc/hdr/mme/s1ap_ue_cap_info.h delete mode 100644 srsepc/src/mme/s1ap_ue_cap_info.cc diff --git a/srsepc/hdr/mme/s1ap.h b/srsepc/hdr/mme/s1ap.h index d417d9442..31ea68436 100644 --- a/srsepc/hdr/mme/s1ap.h +++ b/srsepc/hdr/mme/s1ap.h @@ -44,7 +44,6 @@ #include "mme/s1ap_mngmt_proc.h" #include "mme/s1ap_nas_transport.h" #include "mme/s1ap_ctx_mngmt_proc.h" -#include "mme/s1ap_ue_cap_info.h" #include "mme/mme_gtpc.h" #include "hss/hss.h" @@ -112,7 +111,6 @@ public: s1ap_mngmt_proc* m_s1ap_mngmt_proc; s1ap_nas_transport* m_s1ap_nas_transport; s1ap_ctx_mngmt_proc* m_s1ap_ctx_mngmt_proc; - s1ap_ue_cap_info* m_s1ap_ue_cap_info; std::map m_tmsi_to_imsi; diff --git a/srsepc/hdr/mme/s1ap_ue_cap_info.h b/srsepc/hdr/mme/s1ap_ue_cap_info.h deleted file mode 100644 index 4e3b4c14e..000000000 --- a/srsepc/hdr/mme/s1ap_ue_cap_info.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2017 Software Radio Systems Limited - * - * \section LICENSE - * - * This file is part of srsLTE. - * - * srsLTE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * srsLTE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * A copy of the GNU Affero General Public License can be found in - * the LICENSE file in the top-level directory of this distribution - * and at http://www.gnu.org/licenses/. - * - */ -#ifndef S1AP_UE_CAP_INFO_H -#define S1AP_UE_CAP_INFO_H - -#include "srslte/asn1/liblte_s1ap.h" -#include "srslte/common/common.h" -#include "mme/s1ap_common.h" -#include "srslte/common/log_filter.h" - -namespace srsepc{ - -class s1ap; - -class s1ap_ue_cap_info -{ -public: - - static s1ap_ue_cap_info *m_instance; - - static s1ap_ue_cap_info* get_instance(void); - static void cleanup(void); - void init(void); - - bool handle_ue_capability_info_indication(LIBLTE_S1AP_MESSAGE_UECAPABILITYINFOINDICATION_STRUCT *msg, sctp_sndrcvinfo *enb_sri, srslte::byte_buffer_t *reply_buffer, bool *reply_flag); - -private: - s1ap_ue_cap_info(); - virtual ~s1ap_ue_cap_info(); - - s1ap* m_s1ap; - srslte::log_filter *m_s1ap_log; -}; -} //namespace srsepc -#endif diff --git a/srsepc/src/mme/s1ap.cc b/srsepc/src/mme/s1ap.cc index c22870243..3fe34806c 100644 --- a/srsepc/src/mme/s1ap.cc +++ b/srsepc/src/mme/s1ap.cc @@ -92,9 +92,6 @@ s1ap::init(s1ap_args_t s1ap_args, srslte::log_filter *s1ap_log, hss_interface_s1 m_s1ap_nas_transport->init(m_hss); m_s1ap_ctx_mngmt_proc = s1ap_ctx_mngmt_proc::get_instance(); //Context Management Procedures m_s1ap_ctx_mngmt_proc->init(); - m_s1ap_ue_cap_info = s1ap_ue_cap_info::get_instance(); //UE Capability Information - m_s1ap_ue_cap_info->init(); - //Get pointer to GTP-C class m_mme_gtpc = mme_gtpc::get_instance(); @@ -132,7 +129,6 @@ s1ap::stop() s1ap_mngmt_proc::cleanup(); s1ap_nas_transport::cleanup(); s1ap_ctx_mngmt_proc::cleanup(); - s1ap_ue_cap_info::cleanup(); return; } @@ -142,7 +138,7 @@ s1ap::get_s1_mme() return m_s1mme; } -uint32_t +uint32_t s1ap::get_next_mme_ue_s1ap_id() { return m_next_mme_ue_s1ap_id++; @@ -256,10 +252,6 @@ s1ap::handle_initiating_message(LIBLTE_S1AP_INITIATINGMESSAGE_STRUCT *msg, stru m_s1ap_log->info("Received UE Context Release Request Message.\n"); m_s1ap_ctx_mngmt_proc->handle_ue_context_release_request(&msg->choice.UEContextReleaseRequest, enb_sri, reply_buffer, &reply_flag); break; - case LIBLTE_S1AP_INITIATINGMESSAGE_CHOICE_UECAPABILITYINFOINDICATION: - m_s1ap_log->info("Received UE Context Release Request Message.\n"); - m_s1ap_ue_cap_info->handle_ue_capability_info_indication(&msg->choice.UECapabilityInfoIndication, enb_sri, reply_buffer, &reply_flag); - break; default: m_s1ap_log->error("Unhandled S1AP intiating message: %s\n", liblte_s1ap_initiatingmessage_choice_text[msg->choice_type]); m_s1ap_log->console("Unhandled S1APintiating message: %s\n", liblte_s1ap_initiatingmessage_choice_text[msg->choice_type]); diff --git a/srsepc/src/mme/s1ap_ue_cap_info.cc b/srsepc/src/mme/s1ap_ue_cap_info.cc deleted file mode 100644 index f06fde165..000000000 --- a/srsepc/src/mme/s1ap_ue_cap_info.cc +++ /dev/null @@ -1,78 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2017 Software Radio Systems Limited - * - * \section LICENSE - * - * This file is part of srsLTE. - * - * srsLTE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * srsLTE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * A copy of the GNU Affero General Public License can be found in - * the LICENSE file in the top-level directory of this distribution - * and at http://www.gnu.org/licenses/. - * - */ -#include "mme/s1ap.h" -#include "mme/s1ap_ue_cap_info.h" - -namespace srsepc{ - -s1ap_ue_cap_info* s1ap_ue_cap_info::m_instance = NULL; -boost::mutex s1ap_ue_cap_info_instance_mutex; - - -s1ap_ue_cap_info::s1ap_ue_cap_info() -{ -} - -s1ap_ue_cap_info::~s1ap_ue_cap_info() -{ -} - -s1ap_ue_cap_info* -s1ap_ue_cap_info::get_instance(void) -{ - boost::mutex::scoped_lock lock(s1ap_ue_cap_info_instance_mutex); - if(NULL == m_instance) { - m_instance = new s1ap_ue_cap_info(); - } - return(m_instance); -} - -void -s1ap_ue_cap_info::cleanup(void) -{ - boost::mutex::scoped_lock lock(s1ap_ue_cap_info_instance_mutex); - if(NULL != m_instance) { - delete m_instance; - m_instance = NULL; - } -} - -void -s1ap_ue_cap_info::init(void) -{ - m_s1ap = s1ap::get_instance(); - m_s1ap_log = m_s1ap->m_s1ap_log; -} - -bool -s1ap_ue_cap_info::handle_ue_capability_info_indication(LIBLTE_S1AP_MESSAGE_UECAPABILITYINFOINDICATION_STRUCT *msg, struct sctp_sndrcvinfo *enb_sri, srslte::byte_buffer_t *reply_buffer, bool *reply_flag) -{ - m_s1ap_log->info("UE Capability Info Indication\n"); - m_s1ap_log->console("UE Capability Info Indication\n"); - return true; -} - -} //namespace srsepc