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

enb,ngap: Fix global gnb ID in NGAP

This commit is contained in:
Bedran Karakoc 2022-01-11 18:41:10 +01:00 committed by Andre Puschmann
parent 0812a90d21
commit 9507dbc534
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srsenb/src/main.cc
View File

@ -359,7 +359,7 @@ void parse_args(all_args_t* args, int argc, char* argv[])
// Convert eNB Id
std::size_t pos = {};
try {
args->enb.enb_id = std::stoi(enb_id, &pos, 0);
args->enb.enb_id = std::stoul(enb_id, &pos, 0);
} catch (...) {
cout << "Error parsing enb.enb_id: " << enb_id << "." << endl;
exit(1);

12
srsgnb/src/stack/ngap/ngap.cc
View File

@ -656,18 +656,8 @@ bool ngap::setup_ng()
ng_setup_request_s& container = pdu.init_msg().value.ng_setup_request();
global_gnb_id_s& global_gnb_id = container->global_ran_node_id.value.set_global_gnb_id();
global_gnb_id.plmn_id = tai.plmn_id;
// TODO: when ASN1 is fixed
// global_gnb_id.gnb_id.set_gnb_id().from_number(args.gnb_id);
// container->ran_node_name_present = true;
// container->ran_node_name.value.from_string(args.gnb_name);
asn1::bounded_bitstring<22, 32, false, true>& gnb_str = global_gnb_id.gnb_id.set_gnb_id();
gnb_str.resize(32);
uint8_t buffer[4];
asn1::bit_ref bref(&buffer[0], sizeof(buffer));
bref.pack(args.gnb_id, 8);
memcpy(gnb_str.data(), &buffer[0], bref.distance_bytes());
global_gnb_id.gnb_id.set_gnb_id().from_number(args.gnb_id);
container->ran_node_name_present = true;
if (args.gnb_name.length() >= 150) {