<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24339">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: 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;">[VAMOS] rsl_rx_mode_modif(): handle Channel Identification IE<br><br>For some reason, handling of the Channel Identification IE was done<br>in l1sap_chan_act(). This function is being called on reciept<br>of the CHANnel ACTIVation message, but not on MODE MODIFY.<br><br>Change-Id: I07f95e69e6230a1daca62cc0a7c64954f191fa8a<br>Related: SYS#5315, OS#4940<br>---<br>M src/common/l1sap.c<br>M src/common/rsl.c<br>2 files changed, 32 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/common/l1sap.c b/src/common/l1sap.c</span><br><span>index 45abe4e..a47f653 100644</span><br><span>--- a/src/common/l1sap.c</span><br><span>+++ b/src/common/l1sap.c</span><br><span>@@ -1962,27 +1962,10 @@</span><br><span> int l1sap_chan_act(struct gsm_bts_trx *trx, uint8_t chan_nr, struct tlv_parsed *tp)</span><br><span> {</span><br><span> struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm48_chan_desc *cd;</span><br><span> int rc;</span><br><span> </span><br><span> LOGPLCHAN(lchan, DL1C, LOGL_INFO, "activating channel %s\n", rsl_chan_nr_str(chan_nr));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* osmo-pcu calls this without a valid 'tp' parameter, so we</span><br><span style="color: hsl(0, 100%, 40%);">- * need to make sure ew don't crash here */</span><br><span style="color: hsl(0, 100%, 40%);">- if (tp && TLVP_PRES_LEN(tp, RSL_IE_CHAN_IDENT, sizeof(*cd) + 1)) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Channel Description IE comes together with its IEI (see 9.3.5) */</span><br><span style="color: hsl(0, 100%, 40%);">- cd = (const struct gsm48_chan_desc *) (TLVP_VAL(tp, RSL_IE_CHAN_IDENT) + 1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* The PHY may not support using different TSCs */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!osmo_bts_has_feature(trx->bts->features, BTS_FEAT_MULTI_TSC)</span><br><span style="color: hsl(0, 100%, 40%);">- && cd->h0.tsc != BTS_TSC(trx->bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "This PHY does not support "</span><br><span style="color: hsl(0, 100%, 40%);">- "lchan TSC %u != BSIC-TSC %u, sending NACK\n",</span><br><span style="color: hsl(0, 100%, 40%);">- cd->h0.tsc, BTS_TSC(trx->bts));</span><br><span style="color: hsl(0, 100%, 40%);">- return -RSL_ERR_SERV_OPT_UNIMPL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> lchan->s = trx->bts->radio_link_timeout.current;</span><br><span> </span><br><span> rc = l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_ACTIVATE, 0);</span><br><span>diff --git a/src/common/rsl.c b/src/common/rsl.c</span><br><span>index 1cc7abb..601e5f8 100644</span><br><span>--- a/src/common/rsl.c</span><br><span>+++ b/src/common/rsl.c</span><br><span>@@ -230,6 +230,33 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Handle RSL Channel Identification IE (see section 9.3.5) */</span><br><span style="color: hsl(120, 100%, 40%);">+static int rsl_handle_chan_ident_ie(struct gsm_lchan *lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct tlv_parsed *tp,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *cause)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts_trx_ts *ts = lchan->ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_bts *bts = ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm48_chan_desc *cd;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TLVP_PRES_LEN(tp, RSL_IE_CHAN_IDENT, sizeof(*cd) + 1)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Channel Description IE comes together with its IEI (see 9.3.5) */</span><br><span style="color: hsl(120, 100%, 40%);">+ cd = (const struct gsm48_chan_desc *) (TLVP_VAL(tp, RSL_IE_CHAN_IDENT) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The PHY may not support using different TSCs */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(bts->features, BTS_FEAT_MULTI_TSC)</span><br><span style="color: hsl(120, 100%, 40%);">+ && cd->h0.tsc != BTS_TSC(bts)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "This PHY does not support "</span><br><span style="color: hsl(120, 100%, 40%);">+ "lchan TSC %u != BSIC-TSC %u, sending NACK\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ cd->h0.tsc, BTS_TSC(bts));</span><br><span style="color: hsl(120, 100%, 40%);">+ *cause = RSL_ERR_SERV_OPT_UNIMPL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</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 style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> /*</span><br><span> * support</span><br><span>@@ -1445,6 +1472,8 @@</span><br><span> if (type != RSL_ACT_OSMO_PDCH) {</span><br><span> if (rsl_handle_chan_mod_ie(lchan, &tp, &cause) != 0)</span><br><span> return rsl_tx_chan_act_nack(lchan, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_handle_chan_ident_ie(lchan, &tp, &cause) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_chan_act_nack(lchan, cause);</span><br><span> }</span><br><span> </span><br><span> /* 9.3.7 Encryption Information */</span><br><span>@@ -1956,6 +1985,9 @@</span><br><span> /* 9.3.6 Channel Mode */</span><br><span> if (rsl_handle_chan_mod_ie(lchan, &tp, &cause) != 0)</span><br><span> return rsl_tx_mode_modif_nack(lchan, cause);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 9.3.5 Channel Identification */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rsl_handle_chan_ident_ie(lchan, &tp, &cause) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rsl_tx_mode_modif_nack(lchan, cause);</span><br><span> </span><br><span> if (bts_supports_cm(lchan->ts->trx->bts, ts_pchan(lchan->ts), lchan->tch_mode) != 1) {</span><br><span> LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "%s: invalid mode: %s (wrong BSC configuration?)\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24339">change 24339</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/+/24339"/><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: I07f95e69e6230a1daca62cc0a7c64954f191fa8a </div>
<div style="display:none"> Gerrit-Change-Number: 24339 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>