PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed small bug with sleep.

This commit is contained in:
Pedro Alvarez 2017-10-20 14:16:19 +01:00
parent 0dbddb8a4b
commit bfb7f12298
4 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
srsepc/hdr/mme/s1ap.h
View File

@ -36,7 +36,7 @@
#include <sys/socket.h>
#include <netinet/sctp.h>
#include <unistd.h>
#include <map>
#include "mme/s1ap_common.h"
#include "mme/s1ap_mngmt_proc.h"
@ -71,20 +71,11 @@ private:
s1ap_args_t m_s1ap_args;
uint32_t m_plmn;
/*
uint8_t m_mme_code;
uint16_t m_mme_group;
uint16_t m_tac; // 16-bit tac
uint16_t m_mcc; // BCD-coded with 0xF filler
uint16_t m_mnc; // BCD-coded with 0xF filler
uint32_t m_plmn;
std::string m_mme_bind_addr;
std::string m_mme_name;
*/
srslte::log *m_s1ap_log;
int m_s1mme;
std::map<uint16_t,enb_ctx_t> m_active_enbs;
s1ap_mngmt_proc m_s1ap_mngmt_proc;
};

2
srsepc/src/main.cc
View File

@ -149,7 +149,7 @@ main (int argc,char * argv[] )
mme->start();
while(running) {
sleep(0.5);
sleep(1);
}
mme->stop();

6
srsepc/src/mme/mme.cc
View File

@ -106,12 +106,6 @@ mme::stop()
return;
}
int
mme::get_s1_mme()
{
return m_s1ap.get_s1_mme();
}
void
mme::run_thread()
{

26
srsepc/src/mme/s1ap.cc
View File

@ -24,8 +24,6 @@
*
*/
#include <iostream> //TODO Remove
#include "srslte/common/bcd_helpers.h"
#include "mme/s1ap.h"
@ -43,15 +41,7 @@ s1ap::~s1ap()
int
s1ap::init(s1ap_args_t s1ap_args, srslte::log *s1ap_log)
{
/*
m_mme_code = s1ap_args.mme_code ;
m_mme_group = s1ap_args.mme_group;
m_tac = s1ap_args.tac;
m_mcc = s1ap_args.mcc;
m_mnc = s1ap_args.mnc;
m_mme_bind_addr = s1ap_args.mme_bind_addr;
m_mme_name = std::string("srsmme0");
*/
m_s1ap_args = s1ap_args;
srslte::s1ap_mccmnc_to_plmn(s1ap_args.mcc, s1ap_args.mnc, &m_plmn);
@ -194,9 +184,21 @@ s1ap::handle_s1_setup_request(LIBLTE_S1AP_MESSAGE_S1SETUPREQUEST_STRUCT *msg, st
m_s1ap_mngmt_proc.pack_s1_setup_failure(LIBLTE_S1AP_CAUSEMISC_UNKNOWN_PLMN,&reply_msg);
}
else{
/*
if(m_active_enbs.find(enb_ctx.enb_id))
{
//eNB already registered
}
else
{
//new eNB
}
*/
m_active_enbs.insert(std::pair<uint16_t,enb_ctx_t>(enb_ctx.enb_id,enb_ctx));
m_s1ap_mngmt_proc.pack_s1_setup_response(m_s1ap_args, &reply_msg);
m_s1ap_log->console("S1 Setup Response\n");
m_s1ap_log->info("S1 Setup Response\n");
m_s1ap_mngmt_proc.pack_s1_setup_response(m_s1ap_args, &reply_msg);
}
//Send Reply to eNB