5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in setting MCC and MNC in attach accept. Attach seems to be working again.

Browse Source
master
Pedro Alvarez 6 years ago
parent 1fba7f0afa
commit 55675eb532
4 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File

1
srsepc/hdr/mme/nas.h
Unescape Escape View File

@ -139,6 +139,7 @@ public:
uint16_t mnc,
uint8_t mme_code,
uint16_t mme_group,
uint16_t tac,
std::string apn,
std::string dns,
s1ap_interface_nas *s1ap,

4
srsepc/src/mme/mme.cc
Unescape Escape View File

@ -94,8 +94,8 @@ mme::init(mme_args_t* args, srslte::log_filter *nas_log, srslte::log_filter *s1a
}
/*Log successful initialization*/
m_s1ap_log->info("MME Initialized. MCC: %d, MNC: %d\n",args->s1ap_args.mcc, args->s1ap_args.mnc);
m_s1ap_log->console("MME Initialized. \n");
m_s1ap_log->info("MME Initialized. MCC: 0x%x, MNC: 0x%x\n", args->s1ap_args.mcc, args->s1ap_args.mnc);
m_s1ap_log->console("MME Initialized. MCC: 0x%x, MNC: 0x%x\n", args->s1ap_args.mcc, args->s1ap_args.mnc);
return 0;
}

36
srsepc/src/mme/nas.cc
Unescape Escape View File

@ -44,6 +44,7 @@ nas::init(uint16_t mcc,
uint16_t mnc,
uint8_t mme_code,
uint16_t mme_group,
uint16_t tac,
std::string apn,
std::string dns,
s1ap_interface_nas *s1ap,
@ -55,6 +56,7 @@ nas::init(uint16_t mcc,
m_mnc = mnc;
m_mme_code = mme_code;
m_mme_group = mme_group;
m_tac = tac;
m_apn = apn;
m_dns = dns;
@ -62,6 +64,7 @@ nas::init(uint16_t mcc,
m_gtpc = gtpc;
m_hss = hss;
m_nas_log = nas_log;
m_nas_log->info("NAS Context Initialized. MCC: 0x%x, MNC 0x%x\n", m_mcc, m_mnc);
}
/*******************************
*
@ -702,6 +705,24 @@ nas::pack_attach_accept(srslte::byte_buffer_t *nas_buffer)
LIBLTE_MME_ATTACH_ACCEPT_MSG_STRUCT attach_accept;
LIBLTE_MME_ACTIVATE_DEFAULT_EPS_BEARER_CONTEXT_REQUEST_MSG_STRUCT act_def_eps_bearer_context_req;
//Get decimal MCC and MNC
uint32_t mcc = 0;
mcc += 0x000F & m_mcc;
mcc += 10*( (0x00F0 & m_mcc) >> 4);
mcc += 100*( (0x0F00 & m_mcc) >> 8);
uint32_t mnc = 0;
if ( 0xFF00 == (m_mnc & 0xFF00)) {
//Two digit MNC
mnc += 0x000F & m_mnc;
mnc += 10*((0x00F0 & m_mnc) >> 4);
} else {
//Three digit MNC
mnc += 0x000F & m_mnc;
mnc += 10*((0x00F0 & m_mnc) >> 4);
mnc += 100*((0x0F00 & m_mnc) >> 8);
}
//Attach accept
attach_accept.eps_attach_result = m_emm_ctx.attach_type;
@ -709,17 +730,18 @@ nas::pack_attach_accept(srslte::byte_buffer_t *nas_buffer)
attach_accept.t3412.unit = LIBLTE_MME_GPRS_TIMER_UNIT_1_MINUTE; // GPRS 1 minute unit
attach_accept.t3412.value = 30; // 30 minute periodic timer
//FIXME: Set tai_list from config
attach_accept.tai_list.N_tais = 1;
attach_accept.tai_list.tai[0].mcc = m_mcc;
attach_accept.tai_list.tai[0].mnc = m_mnc;
attach_accept.tai_list.tai[0].mcc = mcc;
attach_accept.tai_list.tai[0].mnc = mnc;
attach_accept.tai_list.tai[0].tac = m_tac;
m_nas_log->info("Attach Accept -- MCC 0x%x, MNC 0x%x\n", m_mcc, m_mnc);
//Allocate a GUTI ot the UE
attach_accept.guti_present=true;
attach_accept.guti.type_of_id = 6; //110 -> GUTI
attach_accept.guti.guti.mcc = m_mcc;
attach_accept.guti.guti.mnc = m_mnc;
attach_accept.guti.guti.mcc = mcc;
attach_accept.guti.guti.mnc = mnc;
attach_accept.guti.guti.mme_group_id = m_mme_group;
attach_accept.guti.guti.mme_code = m_mme_code;
attach_accept.guti.guti.m_tmsi = m_s1ap->allocate_m_tmsi(m_emm_ctx.imsi);
@ -732,8 +754,8 @@ nas::pack_attach_accept(srslte::byte_buffer_t *nas_buffer)
//Set up LAI for combined EPS/IMSI attach
attach_accept.lai_present=true;
attach_accept.lai.mcc = m_mcc;
attach_accept.lai.mnc = m_mnc;
attach_accept.lai.mcc = mcc;
attach_accept.lai.mnc = mnc;
attach_accept.lai.lac = 001;
attach_accept.ms_id_present=true;

2
srsepc/src/mme/s1ap_nas_transport.cc
Unescape Escape View File

@ -386,6 +386,7 @@ s1ap_nas_transport::handle_nas_imsi_attach_request(uint32_t enb_ue_s1ap_id,
m_s1ap->m_s1ap_args.mnc,
m_s1ap->m_s1ap_args.mme_code,
m_s1ap->m_s1ap_args.mme_group,
m_s1ap->m_s1ap_args.tac,
m_s1ap->m_s1ap_args.mme_apn,
m_s1ap->m_s1ap_args.dns_addr,
m_s1ap, m_mme_gtpc, m_hss, m_s1ap->m_nas_log);
@ -510,6 +511,7 @@ s1ap_nas_transport::handle_nas_guti_attach_request( uint32_t enb_ue_s1ap_id,
m_s1ap->m_s1ap_args.mnc,
m_s1ap->m_s1ap_args.mme_code,
m_s1ap->m_s1ap_args.mme_group,
m_s1ap->m_s1ap_args.tac,
m_s1ap->m_s1ap_args.mme_apn,
m_s1ap->m_s1ap_args.dns_addr,
m_s1ap, m_mme_gtpc, m_hss, m_s1ap->m_nas_log);

Write Preview
Loading…
Cancel
Save