<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24210">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ul_tbf: Simplify function rcv_data_block_acknowledged<br><br>Let's avoid different code paths in the loop based on is_tlli_invalid.<br>Instead, always do the proper storing of the block, and if later on the<br>corner case is found (no TLLI received while in Content Resolution<br>process) when checking tlli related stuff, then simply invalidate the<br>block.<br><br>Related: OS#1940<br>Change-Id: I77afaa617d7ce045c0f6d994fc0d8e03fe69de53<br>---<br>M src/tbf_ul.cpp<br>1 file changed, 6 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index 272d8b3..e92a920 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -420,7 +420,6 @@</span><br><span> int num_chunks;</span><br><span> uint8_t *rlc_data;</span><br><span> rdbi = &rlc->block_info[block_idx];</span><br><span style="color: hsl(0, 100%, 40%);">- bool need_rlc_data = false;</span><br><span> </span><br><span> LOGPTBFUL(this, LOGL_DEBUG,</span><br><span> "Got %s RLC data block: CV=%d, BSN=%d, SPB=%d, PI=%d, E=%d, TI=%d, bitoffs=%d\n",</span><br><span>@@ -435,23 +434,12 @@</span><br><span> LOGPTBFUL(this, LOGL_DEBUG, "BSN %d out of window %d..%d (it's normal)\n",</span><br><span> rdbi->bsn,</span><br><span> m_window.v_q(), m_window.mod_sns(m_window.v_q() + ws - 1));</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> } else if (m_window.is_received(rdbi->bsn)) {</span><br><span> LOGPTBFUL(this, LOGL_DEBUG,</span><br><span> "BSN %d already received\n", rdbi->bsn);</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- need_rlc_data = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!is_tlli_valid()) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!rdbi->ti) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTBFUL(this, LOGL_NOTICE, "Missing TLLI within UL DATA.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- need_rlc_data = true;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!need_rlc_data)</span><br><span> continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Store block and meta info to BSN buffer */</span><br><span> </span><br><span>@@ -513,6 +501,10 @@</span><br><span> m_window.invalidate_bsn(rdbi->bsn);</span><br><span> continue;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!is_tlli_valid()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTBFUL(this, LOGL_NOTICE, "Missing TLLI within UL DATA.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ m_window.invalidate_bsn(rdbi->bsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span> }</span><br><span> </span><br><span> m_window.receive_bsn(rdbi->bsn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24210">change 24210</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/+/24210"/><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: I77afaa617d7ce045c0f6d994fc0d8e03fe69de53 </div>
<div style="display:none"> Gerrit-Change-Number: 24210 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>