Change in osmo-pcu[master]: tbf_ul: Set first_(common_)ts in handle_tbf_reject

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26154 )

Change subject: tbf_ul: Set first_(common_)ts in handle_tbf_reject
......................................................................

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
---
M src/tbf_ul.cpp
M tests/tbf/TbfTest.err
2 files changed, 6 insertions(+), 1 deletion(-)

Approvals:
  fixeria: Looks good to me, but someone else must approve
  neels: Looks good to me, but someone else must approve
  pespin: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp
index d6936e1..ca929ea 100644
--- a/src/tbf_ul.cpp
+++ b/src/tbf_ul.cpp
@@ -204,8 +204,11 @@
 	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 a8fd741..0374f57 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -9076,6 +9076,7 @@
 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 @@
 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]

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26154
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I32dcb29ad24519082b8665921efcce0b5a16d12e
Gerrit-Change-Number: 26154
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211108/679432b0/attachment.htm>