<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/20543">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sysinfo: Don't broadcast SI4 GPRS INDICATOR if PCU is disconnected<br><br>Depends: libosmocore.git I9d6ed06731ae15fdcef1a1f397d6ac2b7b1ca980<br>Change-Id: I1fd513ea03297918d15d4b28ed454f9b6dd6ebfa<br>Related: OS#3075<br>---<br>M include/osmo-bts/bts.h<br>M src/common/pcu_sock.c<br>M src/common/rsl.c<br>M src/common/sysinfo.c<br>4 files changed, 56 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 4e496b5..9df7f08 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -158,10 +158,11 @@</span><br><span> /* offsets used while generating SI2quater */</span><br><span> size_t e_offset;</span><br><span> size_t u_offset;</span><br><span style="color: hsl(0, 100%, 40%);">- /* decoded SI3 rest octets - *unmodified* as received from BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* decoded SI rest octets - *unmodified* as received from BSC */</span><br><span> struct osmo_gsm48_si_ro_info si3_ro_decoded;</span><br><span style="color: hsl(0, 100%, 40%);">- /* is SI3 GPRS Indicator currently disabled due to lack of PCU connection? */</span><br><span style="color: hsl(0, 100%, 40%);">- bool si3_gprs_ind_disabled;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_ro_info si4_ro_decoded;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* is SI GPRS Indicator currently disabled due to lack of PCU connection? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool si_gprs_ind_disabled;</span><br><span> </span><br><span> /* ip.access Unit ID's have Site/BTS/TRX layout */</span><br><span> union {</span><br><span>@@ -338,6 +339,7 @@</span><br><span> int bts_supports_cipher(struct gsm_bts *bts, int rsl_cipher);</span><br><span> uint8_t *bts_sysinfo_get(struct gsm_bts *bts, const struct gsm_time *g_time);</span><br><span> void regenerate_si3_restoctets(struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+void regenerate_si4_restoctets(struct gsm_bts *bts);</span><br><span> uint8_t *lchan_sacch_get(struct gsm_lchan *lchan);</span><br><span> int lchan_init_lapdm(struct gsm_lchan *lchan);</span><br><span> </span><br><span>diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c</span><br><span>index ee5f4a6..550dd37 100644</span><br><span>--- a/src/common/pcu_sock.c</span><br><span>+++ b/src/common/pcu_sock.c</span><br><span>@@ -746,8 +746,9 @@</span><br><span> oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_CEASED, OSMO_EVT_PCU_VERS, txt->text);</span><br><span> osmo_strlcpy(bts->pcu_version, txt->text, MAX_VERSION_LENGTH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* patch SI3 to advertise GPRS, *if* the SI3 sent by BSC said so */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* patch SI to advertise GPRS, *if* the SI sent by BSC said so */</span><br><span> regenerate_si3_restoctets(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ regenerate_si4_restoctets(bts);</span><br><span> </span><br><span> if (GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_13))</span><br><span> return pcu_tx_si13(bts, true);</span><br><span>@@ -899,6 +900,7 @@</span><br><span> </span><br><span> /* patch SI3 to remove GPRS indicator */</span><br><span> regenerate_si3_restoctets(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ regenerate_si4_restoctets(bts);</span><br><span> </span><br><span> /* re-enable the generation of ACCEPT for new connections */</span><br><span> state->listen_bfd.when |= OSMO_FD_READ;</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 919981d..cb9c19b 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -378,6 +378,15 @@</span><br><span> /* patch out GPRS indicator from binary if PCU is not connected; will be enabled</span><br><span> * after PCU connects */</span><br><span> regenerate_si3_restoctets(bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (SYSINFO_TYPE_4 == osmo_si) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* decode original SI4 Rest Octets as sent by BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *si4_ro_buf = (uint8_t *) GSM_BTS_SI(bts, osmo_si);</span><br><span style="color: hsl(120, 100%, 40%);">+ si4_ro_buf += offsetof(struct gsm48_system_information_type_4, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsm48_rest_octets_si4_decode(&bts->si4_ro_decoded, si4_ro_buf,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSM_MACBLOCK_LEN - offsetof(struct gsm48_system_information_type_4, data));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* patch out GPRS indicator from binary if PCU is not connected; will be enabled</span><br><span style="color: hsl(120, 100%, 40%);">+ * after PCU connects */</span><br><span style="color: hsl(120, 100%, 40%);">+ regenerate_si4_restoctets(bts);</span><br><span> }</span><br><span> </span><br><span> if (SYSINFO_TYPE_13 == osmo_si)</span><br><span>diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c</span><br><span>index d3efffc..f3deb0d 100644</span><br><span>--- a/src/common/sysinfo.c</span><br><span>+++ b/src/common/sysinfo.c</span><br><span>@@ -197,17 +197,50 @@</span><br><span> /* Create a temporary copy and patch that, if no PCU is around */</span><br><span> si3ro_tmp = bts->si3_ro_decoded;</span><br><span> if (!pcu_connected()) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts->si3_gprs_ind_disabled)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_NOTICE, "Disabling GPRS Indicator in SI3 (No PCU connected)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- bts->si3_gprs_ind_disabled = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->si_gprs_ind_disabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_NOTICE, "Disabling GPRS Indicator in SI (No PCU connected)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si_gprs_ind_disabled = true;</span><br><span> si3ro_tmp.gprs_ind.present = 0;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->si3_gprs_ind_disabled)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DPCU, LOGL_NOTICE, "Enabling GPRS Indicator in SI3 (PCU connected)\n");</span><br><span style="color: hsl(0, 100%, 40%);">- bts->si3_gprs_ind_disabled = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->si_gprs_ind_disabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_NOTICE, "Enabling GPRS Indicator in SI (PCU connected)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si_gprs_ind_disabled = false;</span><br><span> si3ro_tmp.gprs_ind.present = 1; /* is a no-op as we copy from bts->si3_ro_decoded */</span><br><span> }</span><br><span> </span><br><span> /* re-generate the binary SI3 rest octets */</span><br><span> osmo_gsm48_rest_octets_si3_encode(si3_buf + si3_size, &si3ro_tmp);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* re-generate SI4 restoctets with GPRS indicator depending on the PCU socket connection state */</span><br><span style="color: hsl(120, 100%, 40%);">+void regenerate_si4_restoctets(struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *si4_buf = GSM_BTS_SI(bts, SYSINFO_TYPE_4);</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t si4_size = offsetof(struct gsm48_system_information_type_4, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsm48_si_ro_info si4ro_tmp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If BSC has never set SI4, there's nothing to patch */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!GSM_BTS_HAS_SI(bts, SYSINFO_TYPE_4))</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If SI4 from BSC doesn't have a GPRS indicator, we won't have anything to patch */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->si4_ro_decoded.gprs_ind.present)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Create a temporary copy and patch that, if no PCU is around */</span><br><span style="color: hsl(120, 100%, 40%);">+ si4ro_tmp = bts->si4_ro_decoded;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pcu_connected()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->si_gprs_ind_disabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_NOTICE, "Disabling GPRS Indicator in SI (No PCU connected)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si_gprs_ind_disabled = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ si4ro_tmp.gprs_ind.present = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts->si_gprs_ind_disabled)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DPCU, LOGL_NOTICE, "Enabling GPRS Indicator in SI (PCU connected)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->si_gprs_ind_disabled = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ si4ro_tmp.gprs_ind.present = 1; /* is a no-op as we copy from bts->si4_ro_decoded */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* re-generate the binary SI4 rest octets */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_gsm48_rest_octets_si4_encode(si4_buf + si4_size, &si4ro_tmp, GSM_MACBLOCK_LEN - si4_size);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/20543">change 20543</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-bts/+/20543"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I1fd513ea03297918d15d4b28ed454f9b6dd6ebfa </div>
<div style="display:none"> Gerrit-Change-Number: 20543 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>