<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/8099">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">deprecate dyn_ts_allow_tch_f and by default allow all TCH<br><br>In osmo-nitb, the way TCH lchans were assigned often resulted in mismatching<br>TCH kinds, causing problems in the lack of transcoding. Hence<br>dyn_ts_allow_tch_f was introduced as a workaround.<br><br>Now however, we always assign an SDCCH to a requesting MS first, and only later<br>assign a TCH channel, which then adheres to the codec list configured at 'msc'<br>in the vty config. Hence it is now considerably harder to obtain a mismatch.<br><br>Furthermore, forcing specific codecs is possible by simply omitting the<br>unwanted ones from the msc config's codec-list. The equivalent of<br>'dyn_ts_allow_tch_f 0' could be e.g. 'codec-list hr3 hr2 hr1'.<br><br>Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e<br>---<br>M src/libbsc/bsc_vty.c<br>M src/libbsc/net_init.c<br>2 files changed, 7 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c</span><br><span>index 1efca0c..ea4c8d0 100644</span><br><span>--- a/src/libbsc/bsc_vty.c</span><br><span>+++ b/src/libbsc/bsc_vty.c</span><br><span>@@ -1001,8 +1001,8 @@</span><br><span>        VTY_OUT_TIMER(3119);</span><br><span>         VTY_OUT_TIMER(3122);</span><br><span>         VTY_OUT_TIMER(3141);</span><br><span style="color: hsl(0, 100%, 40%);">-    vty_out(vty, " dyn_ts_allow_tch_f %d%s",</span><br><span style="color: hsl(0, 100%, 40%);">-              gsmnet->dyn_ts_allow_tch_f ? 1 : 0, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!gsmnet->dyn_ts_allow_tch_f)</span><br><span style="color: hsl(120, 100%, 40%);">+           vty_out(vty, " dyn_ts_allow_tch_f 0%s", VTY_NEWLINE);</span><br><span>      if (gsmnet->tz.override != 0) {</span><br><span>           if (gsmnet->tz.dst)</span><br><span>                       vty_out(vty, " timezone %d %d %d%s",</span><br><span>@@ -4615,7 +4615,7 @@</span><br><span>       return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-DEFUN(cfg_net_dyn_ts_allow_tch_f,</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN_DEPRECATED(cfg_net_dyn_ts_allow_tch_f,</span><br><span>       cfg_net_dyn_ts_allow_tch_f_cmd,</span><br><span>       "dyn_ts_allow_tch_f (0|1)",</span><br><span>       "Allow or disallow allocating TCH/F on TCH_F_TCH_H_PDCH timeslots\n"</span><br><span>@@ -4624,6 +4624,8 @@</span><br><span> {</span><br><span>     struct gsm_network *gsmnet = gsmnet_from_vty(vty);</span><br><span>   gsmnet->dyn_ts_allow_tch_f = atoi(argv[0]) ? true : false;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% dyn_ts_allow_tch_f is deprecated, rather use msc/codec-list to pick codecs%s",</span><br><span style="color: hsl(120, 100%, 40%);">+             VTY_NEWLINE);</span><br><span>        return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c</span><br><span>index d5ea5b2..f03a2e1 100644</span><br><span>--- a/src/libbsc/net_init.c</span><br><span>+++ b/src/libbsc/net_init.c</span><br><span>@@ -52,6 +52,8 @@</span><br><span>            .mnc = 1,</span><br><span>    };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+        net->dyn_ts_allow_tch_f = true;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         /* Permit a compile-time default of A5/3 and A5/1 */</span><br><span>         net->a5_encryption_mask = (1 << 3) | (1 << 1);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/8099">change 8099</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/8099"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib2335d02ea545aff837aadd49f15b2fdb418c46e </div>
<div style="display:none"> Gerrit-Change-Number: 8099 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>