gnb,config: make SRB configuration mandatory

This commit is contained in:
Pedro Alvarez 2022-05-18 12:09:22 +01:00 committed by Andre Puschmann
parent 02b3558390
commit 58f71b10b6
2 changed files with 38 additions and 32 deletions

View File

@ -95,39 +95,39 @@ qci_config = (
);
// 5G Section
// srb1_5g_config = {
// rlc_config = {
// ul_am = {
// sn_field_len = 12;
// t_poll_retx = 50;
// poll_pdu = 4;
// poll_byte = 3000;
// max_retx_thres = 4;
// };
// dl_am = {
// sn_field_len = 12;
// t_reassembly = 50;
// t_status_prohibit = 50;
// };
// };
// }
srb1_5g_config = {
rlc_config = {
ul_am = {
sn_field_len = 12;
t_poll_retx = 45;
poll_pdu = -1;
poll_byte = -1;
max_retx_thres = 8;
};
dl_am = {
sn_field_len = 12;
t_reassembly = 35;
t_status_prohibit = 10;
};
};
}
// srb2_5g_config = {
// rlc_config = {
// ul_am = {
// sn_field_len = 12;
// t_poll_retx = 50;
// poll_pdu = 4;
// poll_byte = 3000;
// max_retx_thres = 4;
// };
// dl_am = {
// sn_field_len = 12;
// t_reassembly = 50;
// t_status_prohibit = 50;
// };
// };
// }
srb2_5g_config = {
rlc_config = {
ul_am = {
sn_field_len = 12;
t_poll_retx = 45;
poll_pdu = -1;
poll_byte = -1;
max_retx_thres = 8;
};
dl_am = {
sn_field_len = 12;
t_reassembly = 35;
t_status_prohibit = 10;
};
};
}
five_qi_config = (
{

View File

@ -2467,6 +2467,12 @@ int parse_rb(all_args_t* args_, rrc_cfg_t* rrc_cfg_, rrc_nr_cfg_t* rrc_nr_cfg_)
if (not srb2_present) {
rrc_cfg_->srb2_cfg.rlc_cfg.set_default_value();
}
if (!srb1_5g_present || !srb2_5g_present) {
fprintf(stderr, "Optional 5G SRB configuration is not supported yet.\n");
fprintf(stderr, "Please specify 5G SRB1 and SRB2 configuration.\n");
return SRSRAN_ERROR;
}
rrc_nr_cfg_->srb1_cfg.present = srb1_5g_present;
rrc_nr_cfg_->srb2_cfg.present = srb1_5g_present;