<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24430">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RSL: rx and tx VAMOS Channel Number cbits for VAMOS lchans<br><br>Add the Osmocom-specific extension to indicate VAMOS shadow lchans in<br>RSL, in lchan lookup and RSL message transmission.<br><br>Note that RR messages containing cbits (Assignment Command, Handover<br>Command, ...) must *not* send Osmocom specific cbits to the MS. Only the<br>RSL messages directed to the BTS send Osmocom specific bits.<br><br>Related: SYS#5315 OS#4940<br>Depends: If33c1695922d110c0d2c60d5c0136caf2587194e (libosmocore)<br>Change-Id: I957eff0d2c33ec795eda75a4bff21965b0179f73<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/bts_trx.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/lcs_loc_req.c<br>M tests/handover/handover_test.c<br>7 files changed, 83 insertions(+), 42 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 0d207b8..11b19ec 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1028,12 +1028,12 @@</span><br><span> const struct abis_om_obj_inst *obj_inst);</span><br><span> </span><br><span> int gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts_nr, uint8_t lchan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_lchan2chan_nr(const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr, uint8_t lchan_nr, bool vamos_is_secondary);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool allow_osmo_cbits);</span><br><span> </span><br><span> int gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span> const struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc, bool allow_osmo_cbits);</span><br><span> int gsm48_lchan2chan_desc_as_configured(struct gsm48_chan_desc *cd, const struct gsm_lchan *lchan,</span><br><span> uint8_t tsc);</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 9fb5362..c430a16 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -280,7 +280,7 @@</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -304,7 +304,7 @@</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg;</span><br><span> uint8_t bs_power_enc;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -336,7 +336,7 @@</span><br><span> {</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -534,7 +534,7 @@</span><br><span> </span><br><span> struct rsl_ie_chan_mode cm;</span><br><span> struct gsm48_chan_desc cd;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -554,7 +554,7 @@</span><br><span> }</span><br><span> </span><br><span> memset(&cd, 0, sizeof(cd));</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm48_lchan2chan_desc(&cd, lchan, lchan->activate.tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_lchan2chan_desc(&cd, lchan, lchan->activate.tsc, true);</span><br><span> if (rc) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "Error encoding Channel Number\n");</span><br><span> return rc;</span><br><span>@@ -667,7 +667,7 @@</span><br><span> struct rsl_ie_chan_mode cm;</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -721,7 +721,7 @@</span><br><span> uint8_t l3_len = msg->len;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -753,7 +753,7 @@</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg = rsl_msgb_alloc();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -775,7 +775,7 @@</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> struct msgb *msg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -914,7 +914,7 @@</span><br><span> struct msgb *msg;</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -939,7 +939,7 @@</span><br><span> /* Chapter 8.3.1 */</span><br><span> int rsl_data_request(struct msgb *msg, uint8_t link_id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(msg->lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(msg->lchan, true);</span><br><span> if (chan_nr < 0) {</span><br><span> msgb_free(msg);</span><br><span> return chan_nr;</span><br><span>@@ -963,7 +963,7 @@</span><br><span> int rsl_establish_request(struct gsm_lchan *lchan, uint8_t link_id)</span><br><span> {</span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -986,7 +986,7 @@</span><br><span> {</span><br><span> </span><br><span> struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -1903,7 +1903,7 @@</span><br><span> ia->proto_discr = GSM48_PDISC_RR;</span><br><span> ia->msg_type = GSM48_MT_RR_IMM_ASS;</span><br><span> ia->page_mode = GSM48_PM_SAME;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm48_lchan2chan_desc(&ia->chan_desc, lchan, lchan->tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_lchan2chan_desc(&ia->chan_desc, lchan, lchan->tsc, true);</span><br><span> if (rc) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "Error encoding Channel Number\n");</span><br><span> return rc;</span><br><span>@@ -2349,7 +2349,7 @@</span><br><span> struct msgb *msg;</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>@@ -2383,7 +2383,7 @@</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> uint32_t *att_ip;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> if (chan_nr < 0)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -2614,7 +2614,7 @@</span><br><span> struct msgb *msg;</span><br><span> struct abis_rsl_dchan_hdr *dh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_pchan2chan_nr(GSM_PCHAN_TCH_F, ts->nr, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_pchan2chan_nr(GSM_PCHAN_TCH_F, ts->nr, 0, false);</span><br><span> if (chan_nr < 0)</span><br><span> return chan_nr;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c</span><br><span>index 3f73f7f..f23f16e 100644</span><br><span>--- a/src/osmo-bsc/bts_trx.c</span><br><span>+++ b/src/osmo-bsc/bts_trx.c</span><br><span>@@ -151,6 +151,7 @@</span><br><span> uint8_t cbits = chan_nr >> 3;</span><br><span> uint8_t lch_idx;</span><br><span> struct gsm_bts_trx_ts *ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ bool vamos = false;</span><br><span> bool ok;</span><br><span> </span><br><span> if (rc)</span><br><span>@@ -160,6 +161,21 @@</span><br><span> * timeslot that is in transition between pchan modes. That ACK actually confirms the pchan switch, so instead</span><br><span> * of checking the current pchan mode, we must allow any pchans that a dyn TS is capable of. */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Interpret Osmocom specific cbits only for OsmoBTS type */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->bts->model->type == GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For VAMOS cbits, set vamos = true and handle cbits as their equivalent non-VAMOS cbits below. */</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (cbits) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs:</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(0):</span><br><span style="color: hsl(120, 100%, 40%);">+ case ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(1):</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits &= ~RSL_CHAN_OSMO_VAMOS_MASK;</span><br><span style="color: hsl(120, 100%, 40%);">+ vamos = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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> switch (cbits) {</span><br><span> case ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs:</span><br><span> lch_idx = 0; /* TCH/F */</span><br><span>@@ -207,6 +223,8 @@</span><br><span> if (rc && ok)</span><br><span> *rc = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos && (trx->bts->model->type == GSM_BTS_TYPE_OSMOBTS))</span><br><span style="color: hsl(120, 100%, 40%);">+ lch_idx += ts->max_primary_lchans;</span><br><span> return &ts->lchan[lch_idx];</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>index dc6434b..a641b45 100644</span><br><span>--- a/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>+++ b/src/osmo-bsc/gsm_04_08_rr.c</span><br><span>@@ -546,7 +546,7 @@</span><br><span> </span><br><span> /* mandatory bits */</span><br><span> gsm48_cell_desc(&ho->cell_desc, new_lchan->ts->trx->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm48_lchan2chan_desc(&ho->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_lchan2chan_desc(&ho->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts), false)) {</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -622,7 +622,7 @@</span><br><span> * the chan_desc. But as long as multi-slot configurations</span><br><span> * are not used we seem to be fine.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan, new_lchan->tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_lchan2chan_desc(&ass->chan_desc, new_lchan, new_lchan->tsc, false);</span><br><span> if (rc) {</span><br><span> msgb_free(msg);</span><br><span> return rc;</span><br><span>@@ -703,7 +703,7 @@</span><br><span> gh->proto_discr = GSM48_PDISC_RR;</span><br><span> gh->msg_type = GSM48_MT_RR_CHAN_MODE_MODIF;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, lchan->modify.tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm48_lchan2chan_desc(&cmm->chan_desc, lchan, lchan->modify.tsc, false);</span><br><span> if (rc) {</span><br><span> msgb_free(msg);</span><br><span> return rc;</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index ce883b0..33a2249 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -496,7 +496,7 @@</span><br><span> </span><br><span> /* See Table 10.5.25 of GSM04.08 */</span><br><span> int gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t ts_nr, uint8_t lchan_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t ts_nr, uint8_t lchan_nr, bool vamos_is_secondary)</span><br><span> {</span><br><span> uint8_t cbits, chan_nr;</span><br><span> </span><br><span>@@ -505,7 +505,10 @@</span><br><span> case GSM_PCHAN_TCH_F_PDCH:</span><br><span> if (lchan_nr != 0)</span><br><span> return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos_is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0x01;</span><br><span> break;</span><br><span> case GSM_PCHAN_PDCH:</span><br><span> if (lchan_nr != 0)</span><br><span>@@ -513,10 +516,14 @@</span><br><span> cbits = RSL_CHAN_OSMO_PDCH >> 3;</span><br><span> break;</span><br><span> case GSM_PCHAN_TCH_H:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_nr > 1)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_nr >= 2)</span><br><span> return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- cbits = 0x02;</span><br><span style="color: hsl(0, 100%, 40%);">- cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vamos_is_secondary)</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits = 0x02;</span><br><span style="color: hsl(120, 100%, 40%);">+ cbits += lchan_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case GSM_PCHAN_CCCH_SDCCH4:</span><br><span> case GSM_PCHAN_CCCH_SDCCH4_CBCH:</span><br><span>@@ -527,14 +534,14 @@</span><br><span> */</span><br><span> if (lchan_nr == CCCH_LCHAN)</span><br><span> chan_nr = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (lchan_nr >= 4)</span><br><span> return -EINVAL;</span><br><span> cbits = 0x04;</span><br><span> cbits += lchan_nr;</span><br><span> break;</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C:</span><br><span> case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_nr > 7)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_nr >= 8)</span><br><span> return -EINVAL;</span><br><span> cbits = 0x08;</span><br><span> cbits += lchan_nr;</span><br><span>@@ -552,16 +559,31 @@</span><br><span> return chan_nr;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_lchan2chan_nr(const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+/* For RSL, to talk to osmo-bts, we introduce Osmocom specific channel number cbits to indicate VAMOS secondary lchans.</span><br><span style="color: hsl(120, 100%, 40%);">+ * However, in RR, which is sent to the MS, these special cbits must not be sent, but their "normal" equivalent; for RR</span><br><span style="color: hsl(120, 100%, 40%);">+ * messages, pass allow_osmo_cbits = false. */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool allow_osmo_cbits)</span><br><span> {</span><br><span> int rc;</span><br><span> uint8_t lchan_nr = lchan->nr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Take care that we never send Osmocom specific cbits to non-Osmo BTS. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (allow_osmo_cbits && lchan->vamos.is_secondary</span><br><span style="color: hsl(120, 100%, 40%);">+ && lchan->ts->trx->bts->model->type != GSM_BTS_TYPE_OSMOBTS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_LCHAN(lchan, LOGL_ERROR, "Cannot address VAMOS shadow lchan on this BTS type: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(bts_type_names, lchan->ts->trx->bts->model->type));</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%);">+ if (allow_osmo_cbits && lchan->ts->trx->bts->model->type != GSM_BTS_TYPE_OSMOBTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ allow_osmo_cbits = false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* The VAMOS lchans are behind the primary ones in the ts->lchan[] array. They keep their lchan->nr as in the</span><br><span> * array, but on the wire they are the "shadow" lchans for the primary lchans. For example, for TCH/F, there is</span><br><span> * a primary ts->lchan[0] and a VAMOS ts->lchan[1]. Still, the VAMOS lchan should send chan_nr = 0. */</span><br><span> if (lchan->vamos.is_secondary)</span><br><span> lchan_nr -= lchan->ts->max_primary_lchans;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm_pchan2chan_nr(lchan->ts->pchan_is, lchan->ts->nr, lchan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ allow_osmo_cbits ? lchan->vamos.is_secondary : false);</span><br><span> /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span> if (rc < 0)</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>@@ -692,9 +714,9 @@</span><br><span> </span><br><span> int gsm48_lchan2chan_desc(struct gsm48_chan_desc *cd,</span><br><span> const struct gsm_lchan *lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t tsc)</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t tsc, bool allow_osmo_cbits)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, allow_osmo_cbits);</span><br><span> if (chan_nr < 0) {</span><br><span> /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR, "Error encoding Channel Number\n");</span><br><span>@@ -712,7 +734,8 @@</span><br><span> const struct gsm_lchan *lchan,</span><br><span> uint8_t tsc)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan_from_config, lchan->ts->nr, lchan->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->vamos.is_secondary);</span><br><span> if (chan_nr < 0) {</span><br><span> /* Log an error so that we don't need to add logging to each caller of this function */</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span>diff --git a/src/osmo-bsc/lcs_loc_req.c b/src/osmo-bsc/lcs_loc_req.c</span><br><span>index d5298eb..7153ce6 100644</span><br><span>--- a/src/osmo-bsc/lcs_loc_req.c</span><br><span>+++ b/src/osmo-bsc/lcs_loc_req.c</span><br><span>@@ -369,7 +369,7 @@</span><br><span> .cause = BSSLAP_CAUSE_INTRA_BSS_HO,</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan, lchan->tsc)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm48_lchan2chan_desc(&apdu->reset.chan_desc, lchan, lchan->tsc, false)) {</span><br><span> lcs_loc_req_fail(LCS_CAUSE_SYSTEM_FAILURE, "Error encoding Channel Number");</span><br><span> return;</span><br><span> }</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index b741e25..bcf9019 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -103,7 +103,7 @@</span><br><span> uint8_t ulm[3], l1i[2], *buf;</span><br><span> struct gsm48_hdr *gh;</span><br><span> struct gsm48_meas_res *mr;</span><br><span style="color: hsl(0, 100%, 40%);">- int chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ int chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> OSMO_ASSERT(chan_nr >= 0);</span><br><span> </span><br><span> dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh));</span><br><span>@@ -555,7 +555,7 @@</span><br><span> dh->c.msg_discr = ABIS_RSL_MDISC_DED_CHAN;</span><br><span> dh->c.msg_type = (act) ? RSL_MT_CHAN_ACTIV_ACK : RSL_MT_RF_CHAN_REL_ACK;</span><br><span> dh->ie_chan = RSL_IE_CHAN_NR;</span><br><span style="color: hsl(0, 100%, 40%);">- dh->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ dh->chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> </span><br><span> msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)dh;</span><br><span>@@ -568,7 +568,7 @@</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(256, 64, "RSL");</span><br><span> struct abis_rsl_rll_hdr *rh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> uint8_t *buf;</span><br><span> struct gsm48_hdr *gh;</span><br><span> struct gsm48_ho_cpl *hc;</span><br><span>@@ -606,7 +606,7 @@</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(256, 64, "RSL");</span><br><span> struct abis_rsl_rll_hdr *rh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> </span><br><span> fprintf(stderr, "- Send EST IND for %s\n", gsm_lchan_name(lchan));</span><br><span> </span><br><span>@@ -628,7 +628,7 @@</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(256, 64, "RSL");</span><br><span> struct abis_rsl_rll_hdr *rh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> </span><br><span> fprintf(stderr, "- Send HO DETECT for %s\n", gsm_lchan_name(lchan));</span><br><span> </span><br><span>@@ -654,7 +654,7 @@</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(256, 64, "RSL");</span><br><span> struct abis_rsl_rll_hdr *rh;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t chan_nr = gsm_lchan2chan_nr(lchan, true);</span><br><span> uint8_t *buf;</span><br><span> struct gsm48_hdr *gh;</span><br><span> struct gsm48_ho_cpl *hc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24430">change 24430</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/+/24430"/><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: I957eff0d2c33ec795eda75a4bff21965b0179f73 </div>
<div style="display:none"> Gerrit-Change-Number: 24430 </div>
<div style="display:none"> Gerrit-PatchSet: 19 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>