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

fix PDCP config in TTCN3 SS

This commit is contained in:
Andre Puschmann 2019-11-07 13:30:50 +01:00
parent 2d126371f6
commit 2f00fd62ec
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
srsenb/src/stack/rrc/rrc.cc
View File

@ -218,12 +218,12 @@ void rrc::add_user(uint16_t rnti)
} }
if (rnti == SRSLTE_MRNTI) { if (rnti == SRSLTE_MRNTI) {
srslte::pdcp_config_t cfg = {.bearer_id = 1, srslte::pdcp_config_t pdcp_cfg = {.bearer_id = 1,
.rb_type = srslte::PDCP_RB_IS_DRB, .rb_type = srslte::PDCP_RB_IS_DRB,
.tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK,
.rx_direction = srslte::SECURITY_DIRECTION_UPLINK, .rx_direction = srslte::SECURITY_DIRECTION_UPLINK,
.sn_len = srslte::PDCP_SN_LEN_12, .sn_len = srslte::PDCP_SN_LEN_12,
.t_reorderding = srslte::pdcp_t_reordering_t::ms500}; .t_reorderding = srslte::pdcp_t_reordering_t::ms500};
uint32_t teid_in = 1; uint32_t teid_in = 1;
@ -231,7 +231,7 @@ void rrc::add_user(uint16_t rnti)
i++) { i++) {
uint32_t lcid = mcch.msg.c1().mbsfn_area_cfg_r9().pmch_info_list_r9[0].mbms_session_info_list_r9[i].lc_ch_id_r9; uint32_t lcid = mcch.msg.c1().mbsfn_area_cfg_r9().pmch_info_list_r9[0].mbms_session_info_list_r9[i].lc_ch_id_r9;
rlc->add_bearer_mrb(SRSLTE_MRNTI, lcid); rlc->add_bearer_mrb(SRSLTE_MRNTI, lcid);
pdcp->add_bearer(SRSLTE_MRNTI, lcid, cfg_); pdcp->add_bearer(SRSLTE_MRNTI, lcid, pdcp_cfg);
gtpu->add_bearer(SRSLTE_MRNTI, lcid, 1, 1, &teid_in); gtpu->add_bearer(SRSLTE_MRNTI, lcid, 1, 1, &teid_in);
} }
} }

11
srsue/test/ttcn3/hdr/ttcn3_sys_interface.h
View File

@ -216,11 +216,12 @@ private:
uint32_t lcid = id["Srb"].GetInt(); uint32_t lcid = id["Srb"].GetInt();
if (lcid > 0) { if (lcid > 0) {
log->info("Configure SRB%d\n", lcid); log->info("Configure SRB%d\n", lcid);
pdcp_config_t pdcp_cfg = {.bearer_id = static_cast<uint8_t>(lcid), pdcp_config_t pdcp_cfg = {.bearer_id = static_cast<uint8_t>(lcid),
.rb_type = PDCP_RB_IS_SRB, .rb_type = PDCP_RB_IS_SRB,
.tx_direction = SECURITY_DIRECTION_DOWNLINK, .tx_direction = SECURITY_DIRECTION_DOWNLINK,
.rx_direction = SECURITY_DIRECTION_UPLINK, .rx_direction = SECURITY_DIRECTION_UPLINK,
.sn_len = PDCP_SN_LEN_5}; .sn_len = PDCP_SN_LEN_5,
.t_reorderding = srslte::pdcp_t_reordering_t::ms500};
syssim->add_srb(lcid, pdcp_cfg); syssim->add_srb(lcid, pdcp_cfg);
} }
} else if (config.HasMember("Release")) { } else if (config.HasMember("Release")) {