From 2f00fd62ec072356888fc307628d63d2c579898d Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 7 Nov 2019 13:30:50 +0100 Subject: [PATCH] fix PDCP config in TTCN3 SS --- srsenb/src/stack/rrc/rrc.cc | 14 +++++++------- srsue/test/ttcn3/hdr/ttcn3_sys_interface.h | 11 ++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/srsenb/src/stack/rrc/rrc.cc b/srsenb/src/stack/rrc/rrc.cc index 03969aa36..b0047885c 100644 --- a/srsenb/src/stack/rrc/rrc.cc +++ b/srsenb/src/stack/rrc/rrc.cc @@ -218,12 +218,12 @@ void rrc::add_user(uint16_t rnti) } if (rnti == SRSLTE_MRNTI) { - srslte::pdcp_config_t cfg = {.bearer_id = 1, - .rb_type = srslte::PDCP_RB_IS_DRB, - .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, - .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, - .sn_len = srslte::PDCP_SN_LEN_12, - .t_reorderding = srslte::pdcp_t_reordering_t::ms500}; + srslte::pdcp_config_t pdcp_cfg = {.bearer_id = 1, + .rb_type = srslte::PDCP_RB_IS_DRB, + .tx_direction = srslte::SECURITY_DIRECTION_DOWNLINK, + .rx_direction = srslte::SECURITY_DIRECTION_UPLINK, + .sn_len = srslte::PDCP_SN_LEN_12, + .t_reorderding = srslte::pdcp_t_reordering_t::ms500}; uint32_t teid_in = 1; @@ -231,7 +231,7 @@ void rrc::add_user(uint16_t rnti) 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; 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); } } diff --git a/srsue/test/ttcn3/hdr/ttcn3_sys_interface.h b/srsue/test/ttcn3/hdr/ttcn3_sys_interface.h index 01f764484..52643827c 100644 --- a/srsue/test/ttcn3/hdr/ttcn3_sys_interface.h +++ b/srsue/test/ttcn3/hdr/ttcn3_sys_interface.h @@ -216,11 +216,12 @@ private: uint32_t lcid = id["Srb"].GetInt(); if (lcid > 0) { log->info("Configure SRB%d\n", lcid); - pdcp_config_t pdcp_cfg = {.bearer_id = static_cast(lcid), - .rb_type = PDCP_RB_IS_SRB, - .tx_direction = SECURITY_DIRECTION_DOWNLINK, - .rx_direction = SECURITY_DIRECTION_UPLINK, - .sn_len = PDCP_SN_LEN_5}; + pdcp_config_t pdcp_cfg = {.bearer_id = static_cast(lcid), + .rb_type = PDCP_RB_IS_SRB, + .tx_direction = SECURITY_DIRECTION_DOWNLINK, + .rx_direction = SECURITY_DIRECTION_UPLINK, + .sn_len = PDCP_SN_LEN_5, + .t_reorderding = srslte::pdcp_t_reordering_t::ms500}; syssim->add_srb(lcid, pdcp_cfg); } } else if (config.HasMember("Release")) {