<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19950">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">SI Type 4: fix missing CBCH Mobile Allocation IE<br><br>According to 3GPP TS 44.018, section 9.1.36.2, the CBCH Mobile<br>Allocation IE shall be present if CBCH Channel Description IE<br>indicates frequency hopping. For some reason it was missing.<br><br>This change makes BSC_Tests.TC_fh_params_si4_cbch pass.<br><br>Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88<br>Related: SYS#4868, OS#4545<br>---<br>M src/osmo-bsc/system_information.c<br>1 file changed, 16 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/50/19950/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index 7011127..2418e32 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -944,7 +944,7 @@</span><br><span> int rc;</span><br><span> struct gsm48_system_information_type_4 *si4 = (struct gsm48_system_information_type_4 *) GSM_BTS_SI(bts, t);</span><br><span> struct gsm_lchan *cbch_lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *restoct = si4->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *tail = si4->data;</span><br><span> </span><br><span> /* length of all IEs present except SI4 rest octets and l2_plen */</span><br><span> int l2_plen = sizeof(*si4) - 1;</span><br><span>@@ -963,13 +963,22 @@</span><br><span> /* Optional: CBCH Channel Description + CBCH Mobile Allocation */</span><br><span> cbch_lchan = gsm_bts_get_cbch(bts);</span><br><span> if (cbch_lchan) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx_ts *ts = cbch_lchan->ts;</span><br><span> struct gsm48_chan_desc cd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 10.5.2.5 (TV) CBCH Channel Description IE */</span><br><span> gsm48_lchan2chan_desc_as_configured(&cd, cbch_lchan);</span><br><span style="color: hsl(0, 100%, 40%);">- tv_fixed_put(si4->data, GSM48_IE_CBCH_CHAN_DESC, 3,</span><br><span style="color: hsl(0, 100%, 40%);">- (uint8_t *) &cd);</span><br><span style="color: hsl(0, 100%, 40%);">- l2_plen += 3 + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- restoct += 3 + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- /* we don't use hopping and thus don't need a CBCH MA */</span><br><span style="color: hsl(120, 100%, 40%);">+ tail = tv_fixed_put(tail, GSM48_IE_CBCH_CHAN_DESC,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(cd), (uint8_t *) &cd);</span><br><span style="color: hsl(120, 100%, 40%);">+ l2_plen += 1 + sizeof(cd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 10.5.2.21 (TLV) CBCH Mobile Allocation IE */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->hopping.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tail = tlv_put(tail, GSM48_IE_CBCH_MOB_AL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.ma_len,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hopping.ma_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ l2_plen += 2 + ts->hopping.ma_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> si4->header.l2_plen = GSM48_LEN2PLEN(l2_plen);</span><br><span>@@ -977,7 +986,7 @@</span><br><span> /* SI4 Rest Octets (10.5.2.35), containing</span><br><span> Optional Power offset, GPRS Indicator,</span><br><span> Cell Identity, LSA ID, Selection Parameter */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = rest_octets_si4(restoct, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - restoct);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = rest_octets_si4(tail, &si_info, (uint8_t *)GSM_BTS_SI(bts, t) + GSM_MACBLOCK_LEN - tail);</span><br><span> </span><br><span> return l2_plen + 1 + rc;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19950">change 19950</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-bsc/+/19950"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8dce506a07d9d291b631b44fa2177c9deff6aa88 </div>
<div style="display:none"> Gerrit-Change-Number: 19950 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>