<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25659">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix TSC / TSC Set used for Handover<br><br>From the nature of the lchan_activate_info.tsc_set and .tsc, it is easy<br>to forget to set tsc_set,tsc = -1 to use default TSC Set and TSC values.<br>Handover code is one such instance that forgets to set -1.<br><br>Change the semantics of tsc_set and tsc so that this kind of error can<br>not happen again as easily: use a separate bool to flag whether to use<br>the default config or explicit values.<br><br>Implicitly fix the lchan_activate_infos "launched" in handover_fsm.c as<br>well as abis_rsl_chan_rqd_queue_poll().<br><br>Related: OS#5244 SYS#4895<br>Related: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af (osmo-ttcn3-hacks)<br>Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/abis_rsl.c<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/lchan_fsm.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>6 files changed, 68 insertions(+), 44 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/59/25659/1</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 03f210f..4c7f348 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -138,6 +138,14 @@</span><br><span> static inline const char *assign_for_name(enum assign_for assign_for)</span><br><span> { return get_value_string(assign_for_names, assign_for); }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* If .use is false, use the default value defined elsewhere. If true, use .val below.</span><br><span style="color: hsl(120, 100%, 40%);">+ * (A practical benefit of this is that the default initialization sets .use to false, so that even if a .val == 0 is a</span><br><span style="color: hsl(120, 100%, 40%);">+ * valid value, a struct containing this as member does not need to explicitly set .val = INVALID_VAL_CONSTANT.) */</span><br><span style="color: hsl(120, 100%, 40%);">+struct optional_val {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool use;</span><br><span style="color: hsl(120, 100%, 40%);">+ int val;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Information retrieved during an Assignment Request from the MSC. This is storage of the Assignment instructions</span><br><span> * parsed from the Assignment Request message, to pass on until the gscon and assignment FSMs have decided whether an</span><br><span> * Assignment is actually going to be carried out. Should remain unchanged after initial decoding. */</span><br><span>@@ -165,12 +173,12 @@</span><br><span> * target_lchan to it. */</span><br><span> struct gsm_lchan *target_lchan;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(0, 100%, 40%);">- * in 3GPP TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc_set;</span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(0, 100%, 40%);">- * TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range</span><br><span style="color: hsl(120, 100%, 40%);">+ * is 1 to 4, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to</span><br><span style="color: hsl(120, 100%, 40%);">+ * 7, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc;</span><br><span> };</span><br><span> </span><br><span> /* State of an ongoing Assignment, while the assignment_fsm is still busy. This serves as state separation to keep the</span><br><span>@@ -621,12 +629,12 @@</span><br><span> bool ta_known;</span><br><span> uint8_t ta;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(0, 100%, 40%);">- * in 3GPP TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc_set;</span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(0, 100%, 40%);">- * TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range</span><br><span style="color: hsl(120, 100%, 40%);">+ * is 1 to 4, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to</span><br><span style="color: hsl(120, 100%, 40%);">+ * 7, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc;</span><br><span> </span><br><span> bool vamos;</span><br><span> </span><br><span>@@ -652,12 +660,12 @@</span><br><span> bool requires_voice_stream;</span><br><span> uint16_t msc_assigned_cic;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described</span><br><span style="color: hsl(0, 100%, 40%);">- * in 3GPP TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc_set;</span><br><span style="color: hsl(0, 100%, 40%);">- /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP</span><br><span style="color: hsl(0, 100%, 40%);">- * TS 45.002. */</span><br><span style="color: hsl(0, 100%, 40%);">- int tsc;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range</span><br><span style="color: hsl(120, 100%, 40%);">+ * is 1 to 4, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to</span><br><span style="color: hsl(120, 100%, 40%);">+ * 7, as described in 3GPP TS 45.002. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct optional_val tsc;</span><br><span> </span><br><span> bool vamos;</span><br><span> };</span><br><span>@@ -695,7 +703,9 @@</span><br><span> * occur later, e.g. during release, that we don't send a NACK out of context. */</span><br><span> bool concluded;</span><br><span> enum gsm0808_cause gsm0808_error_cause;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Actually used TSC Set. */</span><br><span> int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Actually used TSC. */</span><br><span> uint8_t tsc;</span><br><span> } activate;</span><br><span> </span><br><span>@@ -709,7 +719,9 @@</span><br><span> </span><br><span> struct channel_mode_and_rate ch_mode_rate;</span><br><span> struct gsm48_multi_rate_conf mr_conf_filtered;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Actually used TSC Set. */</span><br><span> int tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Actually used TSC. */</span><br><span> uint8_t tsc;</span><br><span> bool concluded;</span><br><span> } modify;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index fb8e386..9882252 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -2087,8 +2087,6 @@</span><br><span> },</span><br><span> .ta = rqd->ta,</span><br><span> .ta_known = true,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = -1,</span><br><span> .imm_ass_time = bts->imm_ass_time,</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 97eb335..5a54928 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -452,8 +452,14 @@</span><br><span> .n_ch_mode_rate = 1,</span><br><span> .ch_mode_rate_list = { lchan->current_ch_mode_rate },</span><br><span> .target_lchan = to_lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = tsc_set,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = (tsc_set >= 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = (tsc >= 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> if (to_lchan)</span><br><span>@@ -822,8 +828,14 @@</span><br><span> .requires_voice_stream = conn->assignment.requires_voice_stream,</span><br><span> .msc_assigned_cic = req->msc_assigned_cic,</span><br><span> /* keep previous training sequence code */</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = lchan->tsc_set,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = lchan->tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = lchan->tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = lchan->tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> lchan_mode_modify(lchan, &modif_info);</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 5ccd784..572434d 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -849,6 +849,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* tsc_set and tsc: -1 to automatically determine which TSC Set / which TSC to use. */</span><br><span> static int trigger_vamos_mode_modify(struct vty *vty, struct gsm_lchan *lchan, bool vamos, int tsc_set, int tsc)</span><br><span> {</span><br><span> struct lchan_modify_info info = {</span><br><span>@@ -856,8 +857,14 @@</span><br><span> .ch_mode_rate = lchan->current_ch_mode_rate,</span><br><span> .requires_voice_stream = (lchan->fi_rtp != NULL),</span><br><span> .vamos = vamos,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = tsc_set,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = (tsc_set >= 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .use = (tsc >= 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ .val = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> </span><br><span> lchan_mode_modify(lchan, &info);</span><br><span>@@ -1540,10 +1547,7 @@</span><br><span> /* Activate / Deactivate a single lchan with a specific codec mode */</span><br><span> static int lchan_act_single(struct vty *vty, struct gsm_lchan *lchan, const char *codec_str, int amr_mode, int activate)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct lchan_activate_info info = {</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_activate_info info = {0};</span><br><span> uint16_t amr_modes[8] =</span><br><span> { GSM0808_SC_CFG_AMR_4_75, GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20, GSM0808_SC_CFG_AMR_5_90,</span><br><span> GSM0808_SC_CFG_AMR_6_70, GSM0808_SC_CFG_AMR_7_40, GSM0808_SC_CFG_AMR_7_95, GSM0808_SC_CFG_AMR_10_2,</span><br><span>@@ -1612,8 +1616,12 @@</span><br><span> </span><br><span> if (activate == 2 || lchan->vamos.is_secondary) {</span><br><span> info.vamos = true;</span><br><span style="color: hsl(0, 100%, 40%);">- info.tsc_set = lchan->vamos.is_secondary ? 1 : 0;</span><br><span style="color: hsl(0, 100%, 40%);">- info.tsc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->vamos.is_secondary) {</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc_set.use = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc_set.val = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc.use = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ info.tsc.val = 0;</span><br><span> info.ch_mode_rate.chan_mode = gsm48_chan_mode_to_vamos(info.ch_mode_rate.chan_mode);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c</span><br><span>index 0faafdb..7ebdaa5 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -714,13 +714,13 @@</span><br><span> </span><br><span> /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by</span><br><span> * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->activate.info.tsc_set > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->activate.tsc_set = lchan->activate.info.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.info.tsc_set.use)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc_set = lchan->activate.info.tsc_set.val;</span><br><span> else</span><br><span> lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1;</span><br><span> </span><br><span> /* Use the TSC provided in the activation request, if any. Otherwise use the timeslot's configured TSC. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.tsc = lchan->activate.info.tsc.use ? lchan->activate.info.tsc.val : gsm_ts_tsc(lchan->ts);</span><br><span> </span><br><span> use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan);</span><br><span> </span><br><span>@@ -1095,8 +1095,6 @@</span><br><span> .ch_mode_rate = lchan->modify.ch_mode_rate,</span><br><span> .requires_voice_stream = true,</span><br><span> .msc_assigned_cic = lchan->modify.info.msc_assigned_cic,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = -1,</span><br><span> };</span><br><span> if (lchan_activate_set_ch_mode_rate_and_mr_config(lchan))</span><br><span> return;</span><br><span>@@ -1250,14 +1248,14 @@</span><br><span> </span><br><span> /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by</span><br><span> * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan->modify.info.tsc_set > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->modify.tsc_set = lchan->modify.info.tsc_set;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->modify.info.tsc_set.use)</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc_set = lchan->modify.info.tsc_set.val;</span><br><span> else</span><br><span> lchan->modify.tsc_set = lchan->vamos.is_secondary ? 2 : 1;</span><br><span> </span><br><span> /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured</span><br><span> * TSC. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->modify.tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->modify.tsc = lchan->modify.info.tsc.use ? lchan->modify.info.tsc.val : gsm_ts_tsc(lchan->ts);</span><br><span> </span><br><span> LOG_LCHAN(lchan, LOGL_INFO,</span><br><span> "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s tsc=%d/%u\n",</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 d786ec6..aab2514 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>@@ -940,8 +940,6 @@</span><br><span> .msc_assigned_cic = cic,</span><br><span> .use_osmux = use_osmux,</span><br><span> .osmux_cid = osmux_cid,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = -1,</span><br><span> };</span><br><span> </span><br><span> /* Match codec information from the assignment command against the</span><br><span>@@ -968,8 +966,6 @@</span><br><span> req = (struct assignment_request){</span><br><span> .assign_for = ASSIGN_FOR_BSSMAP_REQ,</span><br><span> .aoip = aoip,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc_set = -1,</span><br><span style="color: hsl(0, 100%, 40%);">- .tsc = -1,</span><br><span> };</span><br><span> </span><br><span> rc = select_sign_chan(&req, &ct);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/25659">change 25659</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/+/25659"/><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: Iae20df4387c3d75752301bd5daeeea7508966393 </div>
<div style="display:none"> Gerrit-Change-Number: 25659 </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>