<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21084">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">abis_rsl: parse cm3 and indicate ACCH repetition cap to BTS<br><br>In order to activate FACCH/SACCH repetition on the BTS, the classmark 3<br>IE in the CLASSMARK CHANGE message must be parsed and depending on the<br>Repeated ACCH Capability bit the RSL_IE_OSMO_REP_ACCH_CAP is added to<br>the RSL CHAN ACT und RSL CHAN MODE MODIFY. Since<br>RSL_IE_OSMO_REP_ACCH_CAP is a propritary IE, it may only be added for<br>BTS type osmo-bts.<br><br>Change-Id: I39ae439d05562b35b2e47774dc92f8789fea1a57<br>Related: OS#4796 SYS#5114<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/gsm_08_08.c<br>3 files changed, 43 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index ed40e36..a5b5a50 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -322,6 +322,9 @@</span><br><span> enum subscr_sccp_state state;</span><br><span> } lb;</span><br><span> } lcs;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm48_classmark3 cm3;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool cm3_valid;</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 858c683..f8ea5a5 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -457,6 +457,35 @@</span><br><span> lchan->mr_bts_lv + 1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* indicate FACCH/SACCH Repetition to be performed by BTS,</span><br><span style="color: hsl(120, 100%, 40%);">+ * see also: 3GPP TS 44.006, section 10 and 11 */</span><br><span style="color: hsl(120, 100%, 40%);">+static void rep_acch_cap_for_bts(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct abis_rsl_osmo_rep_acch_cap *cap;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The RSL_IE_OSMO_REP_ACCH_CAP IE is a proprietary IE, that can only</span><br><span style="color: hsl(120, 100%, 40%);">+ * be used with osmo-bts type BTSs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(bts->model->type == GSM_BTS_TYPE_OSMOBTS</span><br><span style="color: hsl(120, 100%, 40%);">+ && osmo_bts_has_feature(&bts->features, BTS_FEAT_ACCH_REP)))</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%);">+ cap = (struct abis_rsl_osmo_rep_acch_cap*) msg->tail;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(*cap),</span><br><span style="color: hsl(120, 100%, 40%);">+ (uint8_t*) &bts->repeated_acch_policy);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!(lchan->conn && lchan->conn->cm3_valid</span><br><span style="color: hsl(120, 100%, 40%);">+ && lchan->conn->cm3.repeated_acch_capability)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* MS supports only FACCH repetition for command frames, so</span><br><span style="color: hsl(120, 100%, 40%);">+ * we mask out all other features, even when they are enabled</span><br><span style="color: hsl(120, 100%, 40%);">+ * on this BTS. */</span><br><span style="color: hsl(120, 100%, 40%);">+ cap->dl_facch_all = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cap->dl_sacch = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ cap->ul_sacch = 0;</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%);">+</span><br><span> /* Chapter 8.4.1 */</span><br><span> int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref)</span><br><span> {</span><br><span>@@ -552,6 +581,7 @@</span><br><span> better skip sending it unless we know for sure what each expects. */</span><br><span> </span><br><span> mr_config_for_bts(lchan, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span> msg->dst = trx->rsl_link;</span><br><span> </span><br><span>@@ -590,6 +620,7 @@</span><br><span> }</span><br><span> </span><br><span> mr_config_for_bts(lchan, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span> msg->dst = lchan->ts->trx->rsl_link;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 2c51c95..9c5cf2f 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -34,6 +34,7 @@</span><br><span> #include <osmocom/bsc/lcs_loc_req.h></span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_08_08.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/protocol/gsm_04_08.h></span><br><span> #include <osmocom/gsm/gsm0808.h></span><br><span> #include <osmocom/gsm/mncc.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span>@@ -602,6 +603,14 @@</span><br><span> }</span><br><span> conn_update_ms_power_class(conn, rc8);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_decode_classmark3(&conn->cm3, cm3, cm3_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_NOTICE, "Unable to decode classmark3 during CM Update.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(&conn->cm3, 0, sizeof(conn->cm3));</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->cm3_valid = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->cm3_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!msc_connected(conn))</span><br><span> return;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/21084">change 21084</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/+/21084"/><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: I39ae439d05562b35b2e47774dc92f8789fea1a57 </div>
<div style="display:none"> Gerrit-Change-Number: 21084 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>