mirror of https://github.com/PentHertz/srsLTE.git
Fixed small bug with sleep.
This commit is contained in:
parent
0dbddb8a4b
commit
bfb7f12298
|
@ -36,7 +36,7 @@
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netinet/sctp.h>
|
#include <netinet/sctp.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <map>
|
||||||
#include "mme/s1ap_common.h"
|
#include "mme/s1ap_common.h"
|
||||||
#include "mme/s1ap_mngmt_proc.h"
|
#include "mme/s1ap_mngmt_proc.h"
|
||||||
|
|
||||||
|
@ -71,20 +71,11 @@ private:
|
||||||
|
|
||||||
s1ap_args_t m_s1ap_args;
|
s1ap_args_t m_s1ap_args;
|
||||||
uint32_t m_plmn;
|
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;
|
srslte::log *m_s1ap_log;
|
||||||
|
|
||||||
int m_s1mme;
|
int m_s1mme;
|
||||||
|
std::map<uint16_t,enb_ctx_t> m_active_enbs;
|
||||||
|
|
||||||
s1ap_mngmt_proc m_s1ap_mngmt_proc;
|
s1ap_mngmt_proc m_s1ap_mngmt_proc;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -149,7 +149,7 @@ main (int argc,char * argv[] )
|
||||||
mme->start();
|
mme->start();
|
||||||
|
|
||||||
while(running) {
|
while(running) {
|
||||||
sleep(0.5);
|
sleep(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
mme->stop();
|
mme->stop();
|
||||||
|
|
|
@ -106,12 +106,6 @@ mme::stop()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
|
||||||
mme::get_s1_mme()
|
|
||||||
{
|
|
||||||
return m_s1ap.get_s1_mme();
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
mme::run_thread()
|
mme::run_thread()
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,8 +24,6 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <iostream> //TODO Remove
|
|
||||||
|
|
||||||
#include "srslte/common/bcd_helpers.h"
|
#include "srslte/common/bcd_helpers.h"
|
||||||
#include "mme/s1ap.h"
|
#include "mme/s1ap.h"
|
||||||
|
|
||||||
|
@ -43,15 +41,7 @@ s1ap::~s1ap()
|
||||||
int
|
int
|
||||||
s1ap::init(s1ap_args_t s1ap_args, srslte::log *s1ap_log)
|
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;
|
m_s1ap_args = s1ap_args;
|
||||||
|
|
||||||
srslte::s1ap_mccmnc_to_plmn(s1ap_args.mcc, s1ap_args.mnc, &m_plmn);
|
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);
|
m_s1ap_mngmt_proc.pack_s1_setup_failure(LIBLTE_S1AP_CAUSEMISC_UNKNOWN_PLMN,&reply_msg);
|
||||||
}
|
}
|
||||||
else{
|
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->console("S1 Setup Response\n");
|
||||||
m_s1ap_log->info("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
|
//Send Reply to eNB
|
||||||
|
|
Loading…
Reference in New Issue