<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24201">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Tx ul ack/nack: Avoid sending invalid/unknown TLLI<br><br>It could happen that if MS sends first UL blocks without TLLI (wrongly,<br>due to being in contention resolution), the submitted UL ACK/NACK would<br>contain an invalid TLLI.<br><br>Related: OS#1940<br>Change-Id: Ibae5df6cfbb56f8f8007cb9fec9c29006d673b72<br>---<br>M src/encoding.cpp<br>1 file changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/01/24201/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index 2f58759..136532c 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -890,8 +890,12 @@</span><br><span>  bitvec_write_field(dest, &wp, mcs_chan_code(tbf->current_cs()), 2); // CHANNEL_CODING_COMMAND</span><br><span>         write_packet_ack_nack_desc_gprs(dest, wp, window, is_final);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(0, 100%, 40%);">-  bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+  if (tbf->is_tlli_valid()) {</span><br><span style="color: hsl(120, 100%, 40%);">+                bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+                bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+  } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              bitvec_write_field(dest, &wp, 0, 1); // 0: don't have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span> </span><br><span>        bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance</span><br><span>  bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Power Control Parameters</span><br><span>@@ -1072,8 +1076,14 @@</span><br><span>      bitvec_write_field(dest, &wp, 1, 1); // PRE_EMPTIVE_TRANSMISSION, TODO: This resembles GPRS, change it?</span><br><span>  bitvec_write_field(dest, &wp, 0, 1); // 0: no PRR_RETRANSMISSION_REQUEST, TODO: clarify</span><br><span>  bitvec_write_field(dest, &wp, 0, 1); // 0: no ARAC_RETRANSMISSION_REQUEST, TODO: clarify</span><br><span style="color: hsl(0, 100%, 40%);">-    bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(0, 100%, 40%);">-  bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (tbf->is_tlli_valid()) {</span><br><span style="color: hsl(120, 100%, 40%);">+                bitvec_write_field(dest, &wp, 1, 1); // 1: have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+                bitvec_write_field(dest, &wp, tbf->tlli(), 32); // CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+  } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              bitvec_write_field(dest, &wp, 0, 1); // 0: don't have CONTENTION_RESOLUTION_TLLI</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  bitvec_write_field(dest, &wp, 1, 1); // TBF_EST (enabled)</span><br><span>        bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance</span><br><span>  bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Extended Timing Advance</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24201">change 24201</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/+/24201"/><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: Ibae5df6cfbb56f8f8007cb9fec9c29006d673b72 </div>
<div style="display:none"> Gerrit-Change-Number: 24201 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>