<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24458">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">lchan_fsm: introduce lchan.activate.ch_mode_rate to allow tweaking<br><br>lchan->activate.info.ch_mode_rate should remain unchanged, it is the<br>immutable request data. However, for VAMOS, we will want to<br>automatically see that the chan_mode is chosen correctly.<br><br>As a first step, place a mutable ch_mode_rate copy at<br>lchan->activate.ch_mode_rate, i.e. not in .activate.info, but in<br>.activate. Use that everywhere.<br><br>This is a non-functional change, preparing for a subsequent patch that<br>adds handling of VAMOS shadow lchans.<br><br>Change-Id: Icc9cc7481b3984fdca34eef49ea91ad3388c06fe<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/lchan_fsm.c<br>M src/osmo-bsc/lchan_rtp_fsm.c<br>5 files changed, 17 insertions(+), 13 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/58/24458/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 012b523..da5bd7c 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -645,6 +645,7 @@</span><br><span> </span><br><span> struct {</span><br><span> struct lchan_activate_info info;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct channel_mode_and_rate ch_mode_rate;</span><br><span> struct gsm48_multi_rate_conf mr_conf_filtered;</span><br><span> bool activ_ack; /*< true as soon as RSL Chan Activ Ack is received */</span><br><span> bool immediate_assignment_sent;</span><br><span>diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c</span><br><span>index 7591ecc..02f1109 100644</span><br><span>--- a/src/osmo-bsc/abis_rsl.c</span><br><span>+++ b/src/osmo-bsc/abis_rsl.c</span><br><span>@@ -528,7 +528,7 @@</span><br><span> /* PDCH activation is a job for rsl_tx_dyn_ts_pdch_act_deact(); */</span><br><span> OSMO_ASSERT(act_type != RSL_ACT_OSMO_PDCH);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.info.ch_mode_rate, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = channel_mode_from_lchan(&cm, lchan, &lchan->activate.ch_mode_rate, false);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DRSL, LOGL_ERROR,</span><br><span> "%s Cannot find channel mode from lchan type\n",</span><br><span>@@ -602,7 +602,7 @@</span><br><span> add_power_control_params(msg, RSL_IE_BS_POWER_PARAM, lchan);</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%);">- if (lchan->activate.info.ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span> rc = put_mr_config_for_bts(msg, &lchan->activate.mr_conf_filtered,</span><br><span> (lchan->type == GSM_LCHAN_TCH_F) ? &bts->mr_full : &bts->mr_half);</span><br><span> if (rc) {</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index 81de958..61bb73b 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -210,7 +210,7 @@</span><br><span> if (gscon_is_aoip(conn)) {</span><br><span> /* Extrapolate speech codec from speech mode */</span><br><span> gsm0808_speech_codec_from_chan_type(&sc, perm_spch);</span><br><span style="color: hsl(0, 100%, 40%);">- sc.cfg = conn->lchan->activate.info.ch_mode_rate.s15_s0;</span><br><span style="color: hsl(120, 100%, 40%);">+ sc.cfg = conn->lchan->activate.ch_mode_rate.s15_s0;</span><br><span> sc_ptr = ≻</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 3de4e23..4b0b31f 100644</span><br><span>--- a/src/osmo-bsc/lchan_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_fsm.c</span><br><span>@@ -639,8 +639,11 @@</span><br><span> lchan->bs_power = bts->bs_power_ctrl.bs_power_val_db / 2;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (info->ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (lchan_mr_config(&lchan->activate.mr_conf_filtered, lchan, info->ch_mode_rate.s15_s0) < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->activate.ch_mode_rate = lchan->activate.info.ch_mode_rate;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* future: automatically adjust chan_mode in lchan->activate.ch_mode_rate */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan->activate.ch_mode_rate.chan_mode == GSM48_CMODE_SPEECH_AMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (lchan_mr_config(&lchan->activate.mr_conf_filtered, lchan, lchan->activate.ch_mode_rate.s15_s0) < 0) {</span><br><span> lchan_fail("Can not generate multirate configuration IE\n");</span><br><span> return;</span><br><span> }</span><br><span>@@ -656,7 +659,7 @@</span><br><span> (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new")</span><br><span> : "none",</span><br><span> gsm_lchant_name(lchan->type),</span><br><span style="color: hsl(0, 100%, 40%);">- gsm48_chan_mode_name(lchan->activate.info.ch_mode_rate.chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode),</span><br><span> (lchan->activate.info.encr.alg_id ? : 1)-1,</span><br><span> lchan->activate.info.encr.key_len ? osmo_hexdump_nospc(lchan->activate.info.encr.key,</span><br><span> lchan->activate.info.encr.key_len) : "none");</span><br><span>@@ -806,7 +809,7 @@</span><br><span> int rc;</span><br><span> struct gsm_lchan *lchan = lchan_fi_lchan(fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- lchan->current_ch_mode_rate = lchan->activate.info.ch_mode_rate;</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->current_ch_mode_rate = lchan->activate.ch_mode_rate;</span><br><span> lchan->current_mr_conf = lchan->activate.mr_conf_filtered;</span><br><span> lchan->tsc_set = lchan->activate.tsc_set;</span><br><span> lchan->tsc = lchan->activate.tsc;</span><br><span>diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>index 366bd1b..0b1d4c5 100644</span><br><span>--- a/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>+++ b/src/osmo-bsc/lchan_rtp_fsm.c</span><br><span>@@ -268,19 +268,19 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- val = ipacc_speech_mode(lchan->activate.info.ch_mode_rate.chan_mode, lchan->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ val = ipacc_speech_mode(lchan->activate.ch_mode_rate.chan_mode, lchan->type);</span><br><span> if (val < 0) {</span><br><span> lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gsm48_chan_mode_names, lchan->activate.info.ch_mode_rate.chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),</span><br><span> gsm_lchant_name(lchan->type));</span><br><span> return;</span><br><span> }</span><br><span> lchan->abis_ip.speech_mode = val;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- val = ipacc_payload_type(lchan->activate.info.ch_mode_rate.chan_mode, lchan->type);</span><br><span style="color: hsl(120, 100%, 40%);">+ val = ipacc_payload_type(lchan->activate.ch_mode_rate.chan_mode, lchan->type);</span><br><span> if (val < 0) {</span><br><span> lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(gsm48_chan_mode_names, lchan->activate.info.ch_mode_rate.chan_mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode),</span><br><span> gsm_lchant_name(lchan->type));</span><br><span> return;</span><br><span> }</span><br><span>@@ -834,14 +834,14 @@</span><br><span> </span><br><span> void mgcp_pick_codec(struct mgcp_conn_peer *verb_info, const struct gsm_lchan *lchan, bool bss_side)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.info.ch_mode_rate.chan_mode,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum mgcp_codecs codec = chan_mode_to_mgcp_codec(lchan->activate.ch_mode_rate.chan_mode,</span><br><span> lchan->type == GSM_LCHAN_TCH_H? false : true);</span><br><span> int custom_pt;</span><br><span> </span><br><span> if (codec < 0) {</span><br><span> LOG_LCHAN(lchan, LOGL_ERROR,</span><br><span> "Unable to determine MGCP codec type for %s in chan-mode %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->activate.info.ch_mode_rate.chan_mode));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode));</span><br><span> verb_info->codecs_len = 0;</span><br><span> return;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24458">change 24458</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/+/24458"/><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: Icc9cc7481b3984fdca34eef49ea91ad3388c06fe </div>
<div style="display:none"> Gerrit-Change-Number: 24458 </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>