<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24203">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">encoding: Encode TA in UL ACK/NACK if available<br><br>Change-Id: I3b060ee16aeac5f5d9b314b6bc46383f5e9c44c3<br>---<br>M src/encoding.cpp<br>M tests/tbf/TbfTest.cpp<br>2 files changed, 23 insertions(+), 6 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/03/24203/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 22da6ab..0a4050f 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -897,7 +897,15 @@</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: don't have CONTENTION_RESOLUTION_TLLI</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_ta_is_valid(tbf->ta())) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 1, 1); // 1: have Packet Timing Advance IE (TS 44.060 12.12)</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 1, 1); // 1: have TIMING_ADVANCE_VALUE</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, tbf->ta(), 6); // TIMING_ADVANCE_VALUE</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0, 1); // 0: don't have TIMING_ADVANCE_INDEX</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 Packet Timing Advance</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, 0, 1); // 0: don't have Power Control Parameters</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Extension Bits</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // fixed 0</span><br><span>@@ -1085,7 +1093,16 @@</span><br><span> }</span><br><span> </span><br><span> bitvec_write_field(dest, &wp, 1, 1); // TBF_EST (enabled)</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Packet Timing Advance</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_ta_is_valid(tbf->ta())) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 1, 1); // 1: have Packet Timing Advance IE (TS 44.060 12.12)</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 1, 1); // 1: have TIMING_ADVANCE_VALUE</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, tbf->ta(), 6); // TIMING_ADVANCE_VALUE</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_write_field(dest, &wp, 0, 1); // 0: don't have TIMING_ADVANCE_INDEX</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 Packet Timing Advance</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, 0, 1); // 0: don't have Packet Extended Timing Advance</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Power Control Parameters</span><br><span> bitvec_write_field(dest, &wp, 0, 1); // 0: don't have Extension Bits</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index e0fd9cc..18a0a37 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -794,8 +794,8 @@</span><br><span> </span><br><span> struct msgb *msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- static uint8_t exp1[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x90, 0x87, 0xb0, 0x06,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp1[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x9c, 0x70, 0x87, 0xb0,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x06, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span> };</span><br><span> </span><br><span> if (!msgb_eq_data_print(msg1, exp1, GSM_MACBLOCK_LEN)) {</span><br><span>@@ -821,8 +821,8 @@</span><br><span> </span><br><span> msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- static uint8_t exp2[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x90, 0x88, 0xb0, 0x06, 0x8b,</span><br><span style="color: hsl(0, 100%, 40%);">- 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp2[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x9c, 0x70, 0x88, 0xb0,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x06, 0x8b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span> };</span><br><span> </span><br><span> if (!msgb_eq_data_print(msg1, exp2, GSM_MACBLOCK_LEN)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/24203">change 24203</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/+/24203"/><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: I3b060ee16aeac5f5d9b314b6bc46383f5e9c44c3 </div>
<div style="display:none"> Gerrit-Change-Number: 24203 </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>