<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24365">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RSL link: explicitly select rsl_link based on lchan<br><br>Prepare for VAMOS, where there will be secondary "shadow" lchans serving<br>secondary MS on the same timeslots. For those, RSL messages will need to<br>reflect a different stream ID aka TEI, via an rsl_link_vamos.<br><br>Make sure that every code path that sends an RSL message for a specific<br>lchan selects the RSL link via the new function rsl_chan_link(). When<br>VAMOS is implemented, this function can select the proper RSL stream.<br><br>Rename gsm_bts_trx.rsl_link to rsl_link_primary. This makes sure I'm not<br>missing any uses of the RSL link, and clarifies the code.<br><br>Related: SYS#5315 OS#4940<br>Change-Id: Ifbf16bb296e91f151d19e15e39f5c953ad77ff17<br>---<br>M include/osmocom/bsc/abis_rsl.h<br>M include/osmocom/bsc/bts_trx.h<br>M src/ipaccess/ipaccess-config.c<br>M src/osmo-bsc/abis_nm.c<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/acc.c<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/bts_siemens_bs11.c<br>M src/osmo-bsc/e1_config.c<br>M src/osmo-bsc/gsm_04_08_rr.c<br>M src/osmo-bsc/nm_bb_transc_fsm.c<br>M tests/gsm0408/gsm0408_test.c<br>M tests/handover/handover_test.c<br>15 files changed, 69 insertions(+), 62 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/65/24365/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h</span><br><span>index 158f7fb..dcae348 100644</span><br><span>--- a/include/osmocom/bsc/abis_rsl.h</span><br><span>+++ b/include/osmocom/bsc/abis_rsl.h</span><br><span>@@ -44,6 +44,8 @@</span><br><span> </span><br><span> const char *ip_to_a(uint32_t ip);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len);</span><br><span> int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type,</span><br><span> const uint8_t *data, int len);</span><br><span>diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h</span><br><span>index e42e1e4..4d705d0 100644</span><br><span>--- a/include/osmocom/bsc/bts_trx.h</span><br><span>+++ b/include/osmocom/bsc/bts_trx.h</span><br><span>@@ -33,8 +33,8 @@</span><br><span> uint8_t nr;</span><br><span> /* how do we talk RSL with this TRX? */</span><br><span> struct gsm_e1_subslot rsl_e1_link;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t rsl_tei;</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1inp_sign_link *rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t rsl_tei_primary;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_sign_link *rsl_link_primary;</span><br><span> </span><br><span> /* Timeout for initiating the RSL connection. */</span><br><span> struct osmo_timer_list rsl_connect_timeout;</span><br><span>diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c</span><br><span>index cf649bd..02501bd 100644</span><br><span>--- a/src/ipaccess/ipaccess-config.c</span><br><span>+++ b/src/ipaccess/ipaccess-config.c</span><br><span>@@ -159,7 +159,7 @@</span><br><span> </span><br><span> /* create back-links from bts/trx */</span><br><span> bts->oml_link = oml_link;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->c0->rsl_link = rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->rsl_link_primary = rsl_link;</span><br><span> </span><br><span> /* default port at BTS for incoming connections is 3006 */</span><br><span> if (sin->sin_port == 0)</span><br><span>@@ -1122,7 +1122,7 @@</span><br><span> }</span><br><span> </span><br><span> bts->oml_link->ts->sign.delay = 10;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->c0->rsl_link->ts->sign.delay = 10;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->rsl_link_primary->ts->sign.delay = 10;</span><br><span> while (1) {</span><br><span> rc = osmo_select_main(0);</span><br><span> if (rc < 0)</span><br><span>diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c</span><br><span>index 4fba55c..c98d225 100644</span><br><span>--- a/src/osmo-bsc/abis_nm.c</span><br><span>+++ b/src/osmo-bsc/abis_nm.c</span><br><span>@@ -893,7 +893,7 @@</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(trx, &bts->trx_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx->rsl_link_primary)</span><br><span> return false;</span><br><span> </span><br><span> if (!trx_is_usable(trx))</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 31adf80..a617d32 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -251,7 +251,7 @@</span><br><span> msgb_tlv_put(msg, RSL_IE_FULL_BCCH_INFO, len, data);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -270,7 +270,7 @@</span><br><span> if (data)</span><br><span> msgb_tl16v_put(msg, RSL_IE_L3_INFO, len, data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -290,7 +290,7 @@</span><br><span> if (data)</span><br><span> msgb_tl16v_put(msg, RSL_IE_L3_INFO, len, data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -320,7 +320,7 @@</span><br><span> /* BS Power Control Parameters (if supported by BTS model) */</span><br><span> add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -345,7 +345,7 @@</span><br><span> /* MS Power Control Parameters (if supported by BTS model) */</span><br><span> add_power_control_params(msg, RSL_IE_MS_POWER_PARAM, lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -607,7 +607,7 @@</span><br><span> </span><br><span> rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> rate_ctr_inc(&bts->bts_ctrs->ctr[BTS_CTR_CHAN_ACT_TOTAL]);</span><br><span> switch (lchan->type) {</span><br><span>@@ -667,7 +667,7 @@</span><br><span> </span><br><span> rep_acch_cap_for_bts(lchan, msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -699,7 +699,7 @@</span><br><span> init_dchan_hdr(dh, RSL_MT_ENCR_CMD);</span><br><span> dh->chan_nr = chan_nr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -715,7 +715,7 @@</span><br><span> dh->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span> msg->lchan = lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> DEBUGP(DRSL, "%s DEACTivate SACCH CMD\n", gsm_lchan_name(lchan));</span><br><span> </span><br><span>@@ -734,7 +734,7 @@</span><br><span> dh->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span> msg->lchan = lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -769,7 +769,7 @@</span><br><span> if (bts->type == GSM_BTS_TYPE_RBS2000 && is_gprs)</span><br><span> msgb_tv_put(msg, RSL_IE_ERIC_PACKET_PAG_IND, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = bts->c0->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -829,7 +829,7 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = bts->c0->rsl_link_primary;</span><br><span> return msg;</span><br><span> }</span><br><span> </span><br><span>@@ -872,7 +872,7 @@</span><br><span> DEBUGP(DRSL, "%s TX Siemens MRPCI 0x%02x\n",</span><br><span> gsm_lchan_name(lchan), *(uint8_t *)mrpci);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -890,7 +890,7 @@</span><br><span> rsl_rll_push_l3(msg, RSL_MT_DATA_REQ, gsm_lchan2chan_nr(msg->lchan),</span><br><span> link_id, 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = msg->lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(msg->lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -903,7 +903,7 @@</span><br><span> </span><br><span> msg = rsl_rll_simple(RSL_MT_EST_REQ, gsm_lchan2chan_nr(lchan),</span><br><span> link_id, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> DEBUGP(DRLL, "%s RSL RLL ESTABLISH REQ (link_id=0x%02x)\n",</span><br><span> gsm_lchan_name(lchan), link_id);</span><br><span>@@ -927,7 +927,7 @@</span><br><span> /* 0 is normal release, 1 is local end */</span><br><span> msgb_tv_put(msg, RSL_IE_RELEASE_MODE, release_mode);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> DEBUGP(DRLL, "%s RSL RLL RELEASE REQ (link_id=0x%02x, reason=%u)\n",</span><br><span> gsm_lchan_name(lchan), link_id, release_mode);</span><br><span>@@ -2257,7 +2257,7 @@</span><br><span> LOG_LCHAN(lchan, LOGL_DEBUG, "Sending IPACC CRCX to BTS: speech_mode=0x%02x RTP_PAYLOAD=%d\n",</span><br><span> lchan->abis_ip.speech_mode, lchan->abis_ip.rtp_payload);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -2288,7 +2288,7 @@</span><br><span> if (lchan->abis_ip.rtp_payload2)</span><br><span> msgb_tv_put(msg, RSL_IE_IPAC_RTP_PAYLOAD2, lchan->abis_ip.rtp_payload2);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> </span><br><span> return msg;</span><br><span> }</span><br><span>@@ -2485,7 +2485,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = ts->trx->rsl_link_primary;</span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -2500,7 +2500,7 @@</span><br><span> dh->c.msg_discr = ABIS_RSL_MDISC_DED_CHAN;</span><br><span> dh->chan_nr = gsm_pchan2chan_nr(GSM_PCHAN_TCH_F, ts->nr, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = ts->trx->rsl_link_primary;</span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span> </span><br><span>@@ -2605,7 +2605,7 @@</span><br><span> </span><br><span> msgb_tlv_put(msg, RSL_IE_SMSCB_MSG, len, data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = bts->c0->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -2631,7 +2631,7 @@</span><br><span> if (use_extended_cbch)</span><br><span> msgb_tv_put(cb_cmd, RSL_IE_SMSCB_CHAN_INDICATOR, 0x01);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- cb_cmd->dst = bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ cb_cmd->dst = bts->c0->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(cb_cmd);</span><br><span> }</span><br><span>@@ -2645,7 +2645,7 @@</span><br><span> ch->msg_discr = ABIS_RSL_MDISC_TRX;</span><br><span> ch->msg_type = 0x40; /* Nokia SI Begin */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -2661,7 +2661,7 @@</span><br><span> </span><br><span> msgb_tv_put(msg, 0xFD, 0x00); /* Nokia Pagemode Info, No paging reorganisation required */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>@@ -2678,7 +2678,12 @@</span><br><span> msgb_tv_put(msg, RSL_IE_CHAN_NR, channel);</span><br><span> msgb_tv_put(msg, RSL_IE_BS_POWER, reduction); /* reduction in 2dB steps */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return lchan->ts->trx->rsl_link_primary;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/acc.c b/src/osmo-bsc/acc.c</span><br><span>index 06f96c6..9734a28 100644</span><br><span>--- a/src/osmo-bsc/acc.c</span><br><span>+++ b/src/osmo-bsc/acc.c</span><br><span>@@ -439,7 +439,7 @@</span><br><span> return 0;</span><br><span> </span><br><span> /* RSL must already be up. We cannot send RACH system information to the BTS otherwise. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->rsl_link == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->rsl_link_primary == NULL) {</span><br><span> LOG_TRX(trx, DRSL, LOGL_DEBUG,</span><br><span> "ACC RAMP: ignoring state change because RSL link is down\n");</span><br><span> return 0;</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index 43804a2..aa9d536 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -1136,7 +1136,6 @@</span><br><span> </span><br><span> sapi = link_id & 0x7;</span><br><span> msg->lchan = conn->lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = msg->lchan->ts->trx->rsl_link;</span><br><span> </span><br><span> /* If we are on a TCH and need to submit a SMS (on SAPI=3) we need to use the SACH */</span><br><span> if (allow_sacch && sapi != 0) {</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index b7495d1..ee6a716 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -735,7 +735,7 @@</span><br><span> vty_out(vty, " nominal power %u%s", trx->nominal_power, VTY_NEWLINE);</span><br><span> vty_out(vty, " max_power_red %u%s", trx->max_power_red, VTY_NEWLINE);</span><br><span> config_write_e1_link(vty, &trx->rsl_e1_link, " rsl ");</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " rsl e1 tei %u%s", trx->rsl_tei, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " rsl e1 tei %u%s", trx->rsl_tei_primary, VTY_NEWLINE);</span><br><span> </span><br><span> if (trx->bts->model->config_write_trx)</span><br><span> trx->bts->model->config_write_trx(vty, trx);</span><br><span>@@ -1326,10 +1326,10 @@</span><br><span> </span><br><span> static void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool show_connected)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (show_connected && !trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (show_connected && !trx->rsl_link_primary)</span><br><span> return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!show_connected && trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!show_connected && trx->rsl_link_primary)</span><br><span> return;</span><br><span> </span><br><span> vty_out(vty, "TRX %u of BTS %u is on ARFCN %u%s",</span><br><span>@@ -1341,15 +1341,15 @@</span><br><span> vty_out(vty, " Radio Carrier NM State: ");</span><br><span> net_dump_nmstate(vty, &trx->mo.nm_state);</span><br><span> if (print_rsl)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " RSL State: %s%s", trx->rsl_link_primary? "connected" : "disconnected", VTY_NEWLINE);</span><br><span> vty_out(vty, " Baseband Transceiver NM State: ");</span><br><span> net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state);</span><br><span> if (is_ipaccess_bts(trx->bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei);</span><br><span style="color: hsl(0, 100%, 40%);">- e1isl_dump_vty_tcp(vty, trx->rsl_link);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " ip.access stream ID: 0x%02x ", trx->rsl_tei_primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1isl_dump_vty_tcp(vty, trx->rsl_link_primary);</span><br><span> } else {</span><br><span> vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- e1isl_dump_vty(vty, trx->rsl_link);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1isl_dump_vty(vty, trx->rsl_link_primary);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -5449,7 +5449,7 @@</span><br><span> {</span><br><span> struct gsm_bts_trx *trx = vty->index;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_tei = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_tei_primary = atoi(argv[0]);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index 019c8b8..1e3e9c1 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -525,12 +525,12 @@</span><br><span> /* These are exported because they are used by the VTY interface. */</span><br><span> void ipaccess_drop_rsl(struct gsm_bts_trx *trx, const char *reason)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx->rsl_link)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx->rsl_link_primary)</span><br><span> return;</span><br><span> </span><br><span> LOG_TRX(trx, DLINP, LOGL_NOTICE, "Dropping RSL link: %s\n", reason);</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_sign_link_destroy(trx->rsl_link);</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_link = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_sign_link_destroy(trx->rsl_link_primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link_primary = NULL;</span><br><span> osmo_stat_item_dec(trx->bts->bts_statg->items[BTS_STAT_RSL_CONNECTED], 1);</span><br><span> </span><br><span> if (trx->bts->c0 == trx)</span><br><span>@@ -729,10 +729,10 @@</span><br><span> line = bts->oml_link->ts->line;</span><br><span> ts = e1inp_line_ipa_rsl_ts(line, dev->trx_id);</span><br><span> e1inp_ts_config_sign(ts, line);</span><br><span style="color: hsl(0, 100%, 40%);">- sign_link = trx->rsl_link =</span><br><span style="color: hsl(120, 100%, 40%);">+ sign_link = trx->rsl_link_primary =</span><br><span> e1inp_sign_link_create(ts, E1INP_SIGN_RSL,</span><br><span style="color: hsl(0, 100%, 40%);">- trx, trx->rsl_tei, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_link->ts->sign.delay = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ trx, trx->rsl_tei_primary, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link_primary->ts->sign.delay = 0;</span><br><span> if (!(sign_link->trx->bts->ip_access.flags &</span><br><span> (RSL_UP << sign_link->trx->nr))) {</span><br><span> e1inp_event(sign_link->ts, S_L_INP_TEI_UP,</span><br><span>@@ -947,7 +947,7 @@</span><br><span> if (bs_power_ctrl->mode == GSM_PWR_CTRL_MODE_DYN_BTS)</span><br><span> add_power_params_ie(msg, RSL_IE_BS_POWER_PARAM, bs_power_ctrl);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = trx->rsl_link_primary;</span><br><span> </span><br><span> return abis_rsl_sendmsg(msg);</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>index 08694ea..0d71ce2 100644</span><br><span>--- a/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>+++ b/src/osmo-bsc/bts_siemens_bs11.c</span><br><span>@@ -434,7 +434,7 @@</span><br><span> abis_nm_conn_terr_sign(trx, e1l->e1_nr, e1l->e1_ts,</span><br><span> e1l->e1_ts_ss);</span><br><span> abis_nm_establish_tei(trx->bts, trx->nr, e1l->e1_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- e1l->e1_ts, e1l->e1_ts_ss, trx->rsl_tei);</span><br><span style="color: hsl(120, 100%, 40%);">+ e1l->e1_ts, e1l->e1_ts_ss, trx->rsl_tei_primary);</span><br><span> </span><br><span> /* Set Radio Attributes */</span><br><span> if (trx == trx->bts->c0)</span><br><span>diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c</span><br><span>index bdf7d1c..db77234 100644</span><br><span>--- a/src/osmo-bsc/e1_config.c</span><br><span>+++ b/src/osmo-bsc/e1_config.c</span><br><span>@@ -90,7 +90,7 @@</span><br><span> if (trx->bts->type == GSM_BTS_TYPE_RBS2000) {</span><br><span> struct e1inp_sign_link *oml_link;</span><br><span> oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, trx,</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_tei, SAPI_OML);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_tei_primary, SAPI_OML);</span><br><span> if (!oml_link) {</span><br><span> LOG_TRX(trx, DLINP, LOGL_ERROR, "TRX OML link creation failed\n");</span><br><span> return -ENOMEM;</span><br><span>@@ -100,14 +100,14 @@</span><br><span> trx->oml_link = oml_link;</span><br><span> }</span><br><span> rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL,</span><br><span style="color: hsl(0, 100%, 40%);">- trx, trx->rsl_tei, SAPI_RSL);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx, trx->rsl_tei_primary, SAPI_RSL);</span><br><span> if (!rsl_link) {</span><br><span> LOG_TRX(trx, DLINP, LOGL_ERROR, "TRX RSL link creation failed\n");</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (trx->rsl_link)</span><br><span style="color: hsl(0, 100%, 40%);">- e1inp_sign_link_destroy(trx->rsl_link);</span><br><span style="color: hsl(0, 100%, 40%);">- trx->rsl_link = rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (trx->rsl_link_primary)</span><br><span style="color: hsl(120, 100%, 40%);">+ e1inp_sign_link_destroy(trx->rsl_link_primary);</span><br><span style="color: hsl(120, 100%, 40%);">+ trx->rsl_link_primary = rsl_link;</span><br><span> </span><br><span> for (i = 0; i < TRX_NR_TS; i++)</span><br><span> e1_reconfig_ts(&trx->ts[i]);</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 df497c9..749ef38 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>@@ -51,7 +51,7 @@</span><br><span> int gsm48_sendmsg(struct msgb *msg)</span><br><span> {</span><br><span> if (msg->lchan)</span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = msg->lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(msg->lchan);</span><br><span> </span><br><span> msg->l3h = msg->data;</span><br><span> return rsl_data_request(msg, 0);</span><br><span>diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>index 2fb52f9..9f2a804 100644</span><br><span>--- a/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>+++ b/src/osmo-bsc/nm_bb_transc_fsm.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff);</span><br><span> /* TRX software is active, tell it to initiate RSL Link */</span><br><span> abis_nm_ipaccess_rsl_connect(trx, trx->bts->ip_access.rsl_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- 3003, trx->rsl_tei);</span><br><span style="color: hsl(120, 100%, 40%);">+ 3003, trx->rsl_tei_primary);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index a1aa5f4..7c92c36 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -992,3 +992,4 @@</span><br><span> int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; }</span><br><span> int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len)</span><br><span> { return 0; }</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan) { return NULL; }</span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index d47e97a..1797e4c 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -175,7 +175,7 @@</span><br><span> mr->bcch_f_nc6_hi = neighbors[5].bcch_f >> 2;</span><br><span> mr->bcch_f_nc6_lo = neighbors[5].bcch_f & 3;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)dh;</span><br><span> msg->l3h = (unsigned char *)gh;</span><br><span> </span><br><span>@@ -231,7 +231,7 @@</span><br><span> </span><br><span> rsl_link = talloc_zero(ctx, struct e1inp_sign_link);</span><br><span> rsl_link->trx = bts->c0;</span><br><span style="color: hsl(0, 100%, 40%);">- bts->c0->rsl_link = rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->c0->rsl_link_primary = rsl_link;</span><br><span> </span><br><span> for (trx_i = 0; trx_i < num_trx; trx_i++) {</span><br><span> while (!(trx = gsm_bts_trx_num(bts, trx_i)))</span><br><span>@@ -555,7 +555,7 @@</span><br><span> dh->ie_chan = RSL_IE_CHAN_NR;</span><br><span> dh->chan_nr = gsm_lchan2chan_nr(lchan);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)dh;</span><br><span> </span><br><span> abis_rsl_rcvmsg(msg);</span><br><span>@@ -592,7 +592,7 @@</span><br><span> gh->proto_discr = GSM48_PDISC_RR;</span><br><span> gh->msg_type = GSM48_MT_RR_ASS_COMPL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)rh;</span><br><span> msg->l3h = (unsigned char *)gh;</span><br><span> </span><br><span>@@ -616,7 +616,7 @@</span><br><span> rh->ie_link_id = RSL_IE_LINK_IDENT;</span><br><span> rh->link_id = 0x00;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)rh;</span><br><span> </span><br><span> abis_rsl_rcvmsg(msg);</span><br><span>@@ -638,7 +638,7 @@</span><br><span> rh->ie_link_id = RSL_IE_LINK_IDENT;</span><br><span> rh->link_id = 0x00;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)rh;</span><br><span> </span><br><span> abis_rsl_rcvmsg(msg);</span><br><span>@@ -682,7 +682,7 @@</span><br><span> gh->msg_type =</span><br><span> success ? GSM48_MT_RR_HANDO_COMPL : GSM48_MT_RR_HANDO_FAIL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msg->dst = lchan->ts->trx->bts->c0->rsl_link;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->dst = rsl_chan_link(lchan);</span><br><span> msg->l2h = (unsigned char *)rh;</span><br><span> msg->l3h = (unsigned char *)gh;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24365">change 24365</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/+/24365"/><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: Ifbf16bb296e91f151d19e15e39f5c953ad77ff17 </div>
<div style="display:none"> Gerrit-Change-Number: 24365 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>