<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10270">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">update scrambling only if we have good CRC<br><br>When a bad frame is received, the scrambling should not be updated,<br>because setting scrambling to wrong values will completely break further<br>decoding (until another SYNC frame is received).<br><br>Change-Id: I5e88b52fcbb98532d7ab6ca85e4f956589a595ab<br>---<br>M src/lower_mac/tetra_lower_mac.c<br>1 file changed, 10 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/lower_mac/tetra_lower_mac.c b/src/lower_mac/tetra_lower_mac.c</span><br><span>index 7b62bb4..1e8f2e8 100644</span><br><span>--- a/src/lower_mac/tetra_lower_mac.c</span><br><span>+++ b/src/lower_mac/tetra_lower_mac.c</span><br><span>@@ -229,14 +229,16 @@</span><br><span>            printf("MCC %s(%u) ", osmo_ubit_dump(type2+31, 10), bits_to_uint(type2+31, 10));</span><br><span>           printf("MNC %s(%u)\n", osmo_ubit_dump(type2+41, 14), bits_to_uint(type2+41, 14));</span><br><span>          /* obtain information from SYNC PDU */</span><br><span style="color: hsl(0, 100%, 40%);">-          tcd->colour_code = bits_to_uint(type2+4, 6);</span><br><span style="color: hsl(0, 100%, 40%);">-         tcd->time.tn = bits_to_uint(type2+10, 2);</span><br><span style="color: hsl(0, 100%, 40%);">-            tcd->time.fn = bits_to_uint(type2+12, 5);</span><br><span style="color: hsl(0, 100%, 40%);">-            tcd->time.mn = bits_to_uint(type2+17, 6);</span><br><span style="color: hsl(0, 100%, 40%);">-            tcd->mcc = bits_to_uint(type2+31, 10);</span><br><span style="color: hsl(0, 100%, 40%);">-               tcd->mnc = bits_to_uint(type2+41, 14);</span><br><span style="color: hsl(0, 100%, 40%);">-               /* compute the scrambling code for the current cell */</span><br><span style="color: hsl(0, 100%, 40%);">-          tcd->scramb_init = tetra_scramb_get_init(tcd->mcc, tcd->mnc, tcd->colour_code);</span><br><span style="color: hsl(120, 100%, 40%);">+           if (tup->crc_ok) {</span><br><span style="color: hsl(120, 100%, 40%);">+                 tcd->colour_code = bits_to_uint(type2+4, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+                       tcd->time.tn = bits_to_uint(type2+10, 2);</span><br><span style="color: hsl(120, 100%, 40%);">+                  tcd->time.fn = bits_to_uint(type2+12, 5);</span><br><span style="color: hsl(120, 100%, 40%);">+                  tcd->time.mn = bits_to_uint(type2+17, 6);</span><br><span style="color: hsl(120, 100%, 40%);">+                  tcd->mcc = bits_to_uint(type2+31, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+                     tcd->mnc = bits_to_uint(type2+41, 14);</span><br><span style="color: hsl(120, 100%, 40%);">+                     /* compute the scrambling code for the current cell */</span><br><span style="color: hsl(120, 100%, 40%);">+                        tcd->scramb_init = tetra_scramb_get_init(tcd->mcc, tcd->mnc, tcd->colour_code);</span><br><span style="color: hsl(120, 100%, 40%);">+           }</span><br><span>            /* update the PHY layer time */</span><br><span>              memcpy(&t_phy_state.time, &tcd->time, sizeof(t_phy_state.time));</span><br><span>          tup->lchan = TETRA_LC_BSCH;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10270">change 10270</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/10270"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-tetra </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5e88b52fcbb98532d7ab6ca85e4f956589a595ab </div>
<div style="display:none"> Gerrit-Change-Number: 10270 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Jan Hrach <jenda.2vf9h@hrach.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>