<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26207">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tbf_dl_ass_fsm: Log both TBFs if old TBF is handling assignment for new one<br><br>Change-Id: I4ec4eb2ca3f4fa576a4f9ada8c2462f59ca078b9<br>---<br>M src/tbf_dl_ass_fsm.c<br>M tests/tbf/TbfTest.err<br>2 files changed, 10 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c</span><br><span>index 37ced61..efc872a 100644</span><br><span>--- a/src/tbf_dl_ass_fsm.c</span><br><span>+++ b/src/tbf_dl_ass_fsm.c</span><br><span>@@ -77,9 +77,6 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (new_dl_tbf == as_dl_tbf(ctx->tbf))</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF(ctx->tbf, LOGL_DEBUG, "New and old TBF are the same.\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (old_tfi_is_valid && ms_tlli(ms) == GSM_RESERVED_TMSI) {</span><br><span> LOGPTBF(ctx->tbf, LOGL_ERROR,</span><br><span> "The old TFI is not assigned and there is no TLLI. New TBF %s\n",</span><br><span>@@ -99,7 +96,12 @@</span><br><span> };</span><br><span> bitvec_unhex(&bv, DUMMY_VEC);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBF((struct gprs_rlcmac_tbf *)new_dl_tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ctx->tbf != (struct gprs_rlcmac_tbf *)new_dl_tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBFDL(ctx->tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH) for %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf_name((const struct gprs_rlcmac_tbf *)new_dl_tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBFDL(ctx->tbf, LOGL_INFO, "start Packet Downlink Assignment (PACCH)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> mac_control_block = (RlcMacDownlink_t *)talloc_zero(ctx->tbf, RlcMacDownlink_t);</span><br><span> write_packet_downlink_assignment(mac_control_block, old_tfi_is_valid,</span><br><span> tbf_tfi(ctx->tbf), (tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF),</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index ec0981c..892b31e 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -87,7 +87,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -201,7 +200,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -315,7 +313,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) appending 200 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -2010,7 +2007,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Received RTS for PDCH: FN=2654275 block_nr=9 scheduling USF=0 for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), expect answer on UL FN=2654279</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654275 + 13 = 2654288</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) start Packet Downlink Assignment (PACCH)</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) start Packet Downlink Assignment (PACCH) for TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Scheduled DL Assignment polling on PACCH (FN=2654288, TS=7)</span><br><span>@@ -2663,7 +2660,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Received RTS for PDCH: FN=2654275 block_nr=9 scheduling USF=0 for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), expect answer on UL FN=2654279</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654275 + 13 = 2654288</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) start Packet Downlink Assignment (PACCH)</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) start Packet Downlink Assignment (PACCH) for TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) Scheduled DL Assignment polling on PACCH (FN=2654288, TS=7)</span><br><span>@@ -3362,7 +3359,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) N3101 27 => 28 (< MAX 10)</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654400 + 13 = 2654413</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=ASSIGN) start Packet Downlink Assignment (PACCH)</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=WAIT_RELEASE) start Packet Downlink Assignment (PACCH) for TBF(TFI=1 TLLI=0xf1223344 DIR=DL STATE=ASSIGN)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=WAIT_RELEASE) Scheduled DL Assignment polling on PACCH (FN=2654413, TS=7)</span><br><span>@@ -4085,7 +4082,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -4393,7 +4389,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -4651,7 +4646,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -4869,7 +4863,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -5071,7 +5064,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -5257,7 +5249,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -5419,7 +5410,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -5590,7 +5580,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -5752,7 +5741,6 @@</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) appending 10 bytes</span><br><span> DL_ASS_TBF(DL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=4) POLL scheduled at FN 0 + 13 = 13</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) New and old TBF are the same.</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span>@@ -8118,7 +8106,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Received RTS for PDCH: FN=2654279 block_nr=10 scheduling USF=0 for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS), expect answer on UL FN=2654283</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654279 + 13 = 2654292</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS) start Packet Downlink Assignment (PACCH)</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) start Packet Downlink Assignment (PACCH) for TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=ASSIGN EGPRS)</span><br><span> +++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++</span><br><span> ------------------------- TX : Packet Downlink Assignment -------------------------</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduled DL Assignment polling on PACCH (FN=2654292, TS=7)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/26207">change 26207</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/26207"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4ec4eb2ca3f4fa576a4f9ada8c2462f59ca078b9 </div>
<div style="display:none"> Gerrit-Change-Number: 26207 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>