Merge branch 'epc_fixes' into epc

master
Pedro Alvarez 7 years ago
commit 75f14e57f4

@ -86,6 +86,7 @@ hss::init(hss_args_t *hss_args, srslte::log_filter *hss_log)
/*Read user information from DB*/ /*Read user information from DB*/
if(read_db_file(hss_args->db_file) == false) if(read_db_file(hss_args->db_file) == false)
{ {
m_hss_log->console("Error reading user database file %s\n", hss_args->db_file.c_str());
return -1; return -1;
} }
@ -135,12 +136,12 @@ hss::set_auth_algo(std::string auth_algo)
bool bool
hss::read_db_file(std::string db_filename) hss::read_db_file(std::string db_filename)
{ {
m_db_file.open(db_filename.c_str()); m_db_file.open(db_filename.c_str(), std::ifstream::in);
if(!m_db_file.is_open()) if(!m_db_file.is_open())
{ {
return false; return false;
} }
m_hss_log->info("Opended DB file: %s\n", db_filename.c_str() ); m_hss_log->info("Opened DB file: %s\n", db_filename.c_str() );
std::string line; std::string line;
while (std::getline(m_db_file, line)) while (std::getline(m_db_file, line))

@ -223,7 +223,7 @@ mme_gtpc::send_delete_session_request(ue_ctx_t *ue_ctx)
{ {
m_mme_gtpc_log->info("Sending GTP-C Delete Session Request request\n"); m_mme_gtpc_log->info("Sending GTP-C Delete Session Request request\n");
srslte::gtpc_pdu del_req_pdu; srslte::gtpc_pdu del_req_pdu;
srslte::gtpc_f_teid_ie *sgw_ctrl_fteid; srslte::gtpc_f_teid_ie *sgw_ctrl_fteid = NULL;
//FIXME the UE control TEID sould be stored in the UE ctxt, not in the E-RAB ctxt //FIXME the UE control TEID sould be stored in the UE ctxt, not in the E-RAB ctxt
//Maybe a mme_s1ap_id to ctrl teid map as well? //Maybe a mme_s1ap_id to ctrl teid map as well?
@ -236,6 +236,8 @@ mme_gtpc::send_delete_session_request(ue_ctx_t *ue_ctx)
break; break;
} }
} }
//FIXME: add proper error handling
assert(sgw_ctrl_fteid != NULL);
srslte::gtpc_header *header = &del_req_pdu.header; srslte::gtpc_header *header = &del_req_pdu.header;
header->teid_present = true; header->teid_present = true;

Loading…
Cancel
Save