<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24666">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
dexter: 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;">Introduce VTY command to disable srvcc fast-return on target BTS<br><br>Related: SYS#5337<br>Change-Id: I2ac91b5dffc9b6de60576aabe21a15f24fea38cb<br>---<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>8 files changed, 47 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index a681bc4..d7deb06 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -93,6 +93,8 @@</span><br><span> </span><br><span> static inline const struct osmo_plmn_id *gscon_last_eutran_plmn(const struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return (conn && conn->last_eutran_plmn_valid) ?</span><br><span style="color: hsl(0, 100%, 40%);">- &conn->last_eutran_plmn : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return (conn && conn->fast_return.allowed &&</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fast_return.last_eutran_plmn_valid) ?</span><br><span style="color: hsl(120, 100%, 40%);">+ &conn->fast_return.last_eutran_plmn :</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL;</span><br><span> }</span><br><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 72f83eb..4436ed0 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -539,6 +539,9 @@</span><br><span> </span><br><span> /* We will ignore CHAN RQD with access delay greater than rach_max_delay */</span><br><span> uint8_t rach_max_delay;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Is Fast return to LTE allowed during Chan Release in this BTS? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool srvcc_fast_return_allowed;</span><br><span> };</span><br><span> </span><br><span> #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i])</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index d3d5b7d..37e3899 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -388,8 +388,11 @@</span><br><span> struct gsm48_classmark3 cm3;</span><br><span> bool cm3_valid;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bool last_eutran_plmn_valid;</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_plmn_id last_eutran_plmn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool allowed; /* Is fast return to LTE allowed once the conn is released? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool last_eutran_plmn_valid; /* Is information stored in field below available? */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_plmn_id last_eutran_plmn;</span><br><span style="color: hsl(120, 100%, 40%);">+ } fast_return;</span><br><span> };</span><br><span> </span><br><span> </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 8b89e1a..c4a7875 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>@@ -885,10 +885,11 @@</span><br><span> bsc_subscr_set_imsi(conn->bsub, mi_imsi.imsi);</span><br><span> }</span><br><span> if (TLVP_PRESENT(tp, GSM0808_IE_LAST_USED_EUTRAN_PLMN_ID)) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->last_eutran_plmn_valid = true;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_plmn_from_bcd(TLVP_VAL(tp, GSM0808_IE_LAST_USED_EUTRAN_PLMN_ID), &conn->last_eutran_plmn);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fast_return.allowed = true; /* Always allowed for CSFB */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fast_return.last_eutran_plmn_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_plmn_from_bcd(TLVP_VAL(tp, GSM0808_IE_LAST_USED_EUTRAN_PLMN_ID), &conn->fast_return.last_eutran_plmn);</span><br><span> LOGPFSML(fi, LOGL_DEBUG, "subscr comes from E-UTRAN PLMN %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_plmn_name(&conn->last_eutran_plmn));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_plmn_name(&conn->fast_return.last_eutran_plmn));</span><br><span> }</span><br><span> gscon_update_id(conn);</span><br><span> break;</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 880bd94..707d99c 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1289,6 +1289,9 @@</span><br><span> VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts->srvcc_fast_return_allowed)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " srvcc fast-return forbid%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* BS/MS Power Control parameters */</span><br><span> config_write_power_ctrl(vty, 2, &bts->bs_power_ctrl);</span><br><span> config_write_power_ctrl(vty, 2, &bts->ms_power_ctrl);</span><br><span>@@ -5001,6 +5004,20 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_ATTR(cfg_bts_srvcc_fast_return, cfg_bts_srvcc_fast_return_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "srvcc fast-return (allow|forbid)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "SRVCC Configuration\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow or forbid Fast Return to 4G on Channel Release in this BTS\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Allow\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Forbid\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ CMD_ATTR_IMMEDIATE)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->srvcc_fast_return_allowed = strcmp(argv[0], "allow") == 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define BS_POWER_CONTROL_CMD \</span><br><span> "bs-power-control"</span><br><span> #define MS_POWER_CONTROL_CMD \</span><br><span>@@ -8105,6 +8122,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd);</span><br><span> </span><br><span> neighbor_ident_vty_init();</span><br><span> /* See also handover commands added on bts level from handover_vty.c */</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 4b02042..e140565 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -362,6 +362,9 @@</span><br><span> </span><br><span> bts->rach_max_delay = 63;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* SRVCC is enabled by default */</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->srvcc_fast_return_allowed = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return bts;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 8141a5d..08b1dc7 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -721,9 +721,10 @@</span><br><span> }</span><br><span> </span><br><span> if (req->last_eutran_plmn_valid) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn->last_eutran_plmn_valid = true;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&conn->last_eutran_plmn, &req->last_eutran_plmn,</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(conn->last_eutran_plmn));</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fast_return.allowed = ho->new_bts->srvcc_fast_return_allowed;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->fast_return.last_eutran_plmn_valid = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&conn->fast_return.last_eutran_plmn, &req->last_eutran_plmn,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(conn->fast_return.last_eutran_plmn));</span><br><span> }</span><br><span> </span><br><span> lchan_activate(ho->new_lchan, &info);</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index da0429b..563a957 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -460,7 +460,7 @@</span><br><span> }</span><br><span> </span><br><span> if (TLVP_PRESENT(&tp, GSM0808_IE_CSFB_INDICATION) &&</span><br><span style="color: hsl(0, 100%, 40%);">- !conn->last_eutran_plmn_valid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ !conn->fast_return.last_eutran_plmn_valid) {</span><br><span> LOGPFSML(conn->fi, LOGL_NOTICE,</span><br><span> "Clear Command: CSFB Indication present, "</span><br><span> "but subscriber has no Last Used E-UTRAN PLMN Id! "</span><br><span>@@ -1372,10 +1372,13 @@</span><br><span> .current_channel_type_1 = gsm0808_current_channel_type_1(lchan->type),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (conn->last_eutran_plmn_valid) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Even if fast_return is now allowed locally, we may still want to</span><br><span style="color: hsl(120, 100%, 40%);">+ * signal the Last EUTRAN PLMN Id to the new cell, since destination</span><br><span style="color: hsl(120, 100%, 40%);">+ * config may differ and allow fast return */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->fast_return.last_eutran_plmn_valid) {</span><br><span> params.old_bss_to_new_bss_info_present = true;</span><br><span> params.old_bss_to_new_bss_info.last_eutran_plmn_id_present = true;</span><br><span style="color: hsl(0, 100%, 40%);">- params.old_bss_to_new_bss_info.last_eutran_plmn_id = conn->last_eutran_plmn;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.old_bss_to_new_bss_info.last_eutran_plmn_id = conn->fast_return.last_eutran_plmn;</span><br><span> }</span><br><span> </span><br><span> switch (lchan->type) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24666">change 24666</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/+/24666"/><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: I2ac91b5dffc9b6de60576aabe21a15f24fea38cb </div>
<div style="display:none"> Gerrit-Change-Number: 24666 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@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>