diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-11-08 12:42:06 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2021-11-08 13:24:20 +0100 |
| commit | 063296883f32d8b5e5ed5d18366b4ce1f02b30ef (patch) | |
| tree | 81f4e080fe3908cb593764b594456c73e7be65b1 | |
| parent | 92cbe4aee0c0ca7c374d98060c17010014265a6e (diff) | |
tbf_ul: Set first_(common_)ts in handle_tbf_reject
Let's set them to match expectancies for this type of dummy TBFs, in
order to avoid acidental use/access of other timeslots to the one where
the reject was associated to.
Also use tbf_assign_control_ts() to log the TS used for the TBF, similar
to what's used in other places where control_ts is assigned.
Related: OS#5293
Change-Id: I32dcb29ad24519082b8665921efcce0b5a16d12e
| -rw-r--r-- | src/tbf_ul.cpp | 5 | ||||
| -rw-r--r-- | tests/tbf/TbfTest.err | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index d6936e18..ca929eae 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -204,8 +204,11 @@ struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts, talloc_set_destructor(ul_tbf, ul_tbf_dtor); new (ul_tbf) gprs_rlcmac_ul_tbf(bts, ms); - ul_tbf->control_ts = ts; ul_tbf->trx = trx; + /* The only one TS is the common, control TS */ + ul_tbf->first_ts = ts; + ul_tbf->first_common_ts = ts; + tbf_assign_control_ts(ul_tbf); ul_tbf->m_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ctrg_desc, next_tbf_ctr_group_id++); ul_tbf->m_ul_egprs_ctrs = rate_ctr_group_alloc(ul_tbf, &tbf_ul_egprs_ctrg_desc, diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index a8fd7418..0374f57e 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -9076,6 +9076,7 @@ TBF{NEW}: Allocated UL_ASS_TBF{NONE}: Allocated DL_ASS_TBF{NONE}: Allocated UL_ACK_TBF{NONE}: Allocated +TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NEW) Setting Control TS 7 MS(TLLI=0xffeeddd3, IMSI=, TA=7, 11/11,) Attaching UL TBF: TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NEW) TBF{NEW}: Received Event ASSIGN_ADD_PACCH TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NEW) set ass. type PACCH [prev CCCH:0, PACCH:0] @@ -9106,6 +9107,7 @@ TBF{NEW}: Allocated UL_ASS_TBF{NONE}: Allocated DL_ASS_TBF{NONE}: Allocated UL_ACK_TBF{NONE}: Allocated +TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NEW) Setting Control TS 7 MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Attaching UL TBF: TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NEW) TBF{NEW}: Received Event ASSIGN_ADD_PACCH TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NEW) set ass. type PACCH [prev CCCH:0, PACCH:0] |