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

Changing RRC key logging from debug to info. Small readability fix.

Browse Source
master
Pedro Alvarez 6 years ago committed by Andre Puschmann
parent 553f8260bb
commit 548808ecee
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

6
srsenb/src/upper/rrc.cc
Unescape Escape View File

@ -1167,9 +1167,9 @@ void rrc::ue::set_security_key(uint8_t* key, uint32_t length)
k_up_enc, k_up_int, k_up_enc, k_up_int,
cipher_algo, integ_algo); cipher_algo, integ_algo);
parent->rrc_log->debug_hex(k_rrc_enc, 32, "RRC Encryption Key (k_rrc_enc)"); parent->rrc_log->info_hex(k_rrc_enc, 32, "RRC Encryption Key (k_rrc_enc)");
parent->rrc_log->debug_hex(k_rrc_int, 32, "RRC Integrity Key (k_rrc_int)"); parent->rrc_log->info_hex(k_rrc_int, 32, "RRC Integrity Key (k_rrc_int)");
parent->rrc_log->debug_hex(k_up_enc, 32, "RRC Encryption Key (k_rrc_enc)"); parent->rrc_log->info_hex(k_up_enc, 32, "RRC Encryption Key (k_rrc_enc)");
} }
bool rrc::ue::setup_erabs(LIBLTE_S1AP_E_RABTOBESETUPLISTCTXTSUREQ_STRUCT *e) bool rrc::ue::setup_erabs(LIBLTE_S1AP_E_RABTOBESETUPLISTCTXTSUREQ_STRUCT *e)

6
srsue/src/upper/nas.cc
Unescape Escape View File

@ -1178,7 +1178,8 @@ void nas::gen_attach_request(byte_buffer_t *msg) {
} }
if (have_ctxt) { if (have_ctxt) {
set_k_enb_count(ctxt.tx_count++); set_k_enb_count(ctxt.tx_count);
ctxt.tx_count++;
} }
} }
@ -1214,7 +1215,8 @@ void nas::gen_service_request(byte_buffer_t *msg) {
if(pcap != NULL) { if(pcap != NULL) {
pcap->write_nas(msg->msg, msg->N_bytes); pcap->write_nas(msg->msg, msg->N_bytes);
} }
set_k_enb_count(ctxt.tx_count++); set_k_enb_count(ctxt.tx_count);
ctxt.tx_count++;
} }
void nas::gen_pdn_connectivity_request(LIBLTE_BYTE_MSG_STRUCT *msg) { void nas::gen_pdn_connectivity_request(LIBLTE_BYTE_MSG_STRUCT *msg) {

10
srsue/src/upper/rrc.cc
Unescape Escape View File

@ -2074,12 +2074,12 @@ void rrc::parse_dl_dcch(uint32_t lcid, byte_buffer_t *pdu) {
// Generate AS security keys // Generate AS security keys
uint8_t k_asme[32]; uint8_t k_asme[32];
nas->get_k_asme(k_asme, 32); nas->get_k_asme(k_asme, 32);
rrc_log->debug_hex(k_asme, 32, " UE K_asme"); rrc_log->debug_hex(k_asme, 32, "UE K_asme");
rrc_log->debug("Generating K_enb. UL NAS COUNT %d\n", nas->get_k_enb_count()); rrc_log->debug("Generating K_enb with UL NAS COUNT: %d\n", nas->get_k_enb_count());
usim->generate_as_keys(k_asme, nas->get_k_enb_count(), k_rrc_enc, k_rrc_int, k_up_enc, k_up_int, cipher_algo, integ_algo); usim->generate_as_keys(k_asme, nas->get_k_enb_count(), k_rrc_enc, k_rrc_int, k_up_enc, k_up_int, cipher_algo, integ_algo);
rrc_log->debug_hex(k_rrc_enc, 32, "RRC encryption key - k_rrc_enc"); rrc_log->info_hex(k_rrc_enc, 32, "RRC encryption key - k_rrc_enc");
rrc_log->debug_hex(k_rrc_int, 32, "RRC integrity key - k_rrc_int"); rrc_log->info_hex(k_rrc_int, 32, "RRC integrity key - k_rrc_int");
rrc_log->debug_hex(k_up_enc, 32, "UP encryption key - k_up_enc"); rrc_log->info_hex(k_up_enc, 32, "UP encryption key - k_up_enc");
security_is_activated = true; security_is_activated = true;

Write Preview
Loading…
Cancel
Save