<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24625">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: add lchan modify '(vamos|non-vamos)' command<br><br>Change-Id: If44c3483d4d3d86f5822c5ad882aaeeaff27e3af<br>---<br>M src/osmo-bsc/bsc_vty.c<br>M tests/osmo-bsc.vty<br>2 files changed, 113 insertions(+), 28 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/25/24625/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index 724a3b0..79026a1 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -102,6 +102,12 @@</span><br><span> BTS_NR_TRX_TS_STR2 \</span><br><span> "Sub-slot for manual command\n" SS_NR_STR</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define TSC_ARGS_OPT "[tsc] [<1-4>] [<0-7>]"</span><br><span style="color: hsl(120, 100%, 40%);">+#define TSC_ARGS_DOC \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Provide specific TSC Set and Training Sequence Code\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "TSC Set\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "Training Sequence Code\n"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* FIXME: this should go to some common file */</span><br><span> static const struct value_string gprs_ns_timer_strs[] = {</span><br><span> { 0, "tns-block" },</span><br><span>@@ -192,6 +198,34 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* resolve a gsm_bts_trx_ts basd on the given numeric identifiers */</span><br><span style="color: hsl(120, 100%, 40%);">+static struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, const char *bts_str, const char *trx_str,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *ts_str)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int bts_nr = atoi(bts_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ int trx_nr = atoi(trx_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ int ts_nr = atoi(ts_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx *trx;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ts;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void net_dump_nmstate(struct vty *vty, struct gsm_nm_state *nms)</span><br><span> {</span><br><span> vty_out(vty,"Oper '%s', Admin '%s', Avail '%s'%s",</span><br><span>@@ -1975,6 +2009,21 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int trigger_vamos_mode_modify(struct vty *vty, struct gsm_lchan *lchan, bool vamos, int tsc_set, int tsc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct lchan_modify_info info = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .modify_for = MODIFY_FOR_VTY,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ch_mode_rate = lchan->current_ch_mode_rate,</span><br><span style="color: hsl(120, 100%, 40%);">+ .requires_voice_stream = (lchan->fi_rtp != NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+ .vamos = vamos,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc_set = tsc_set,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tsc = tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_mode_modify(lchan, &info);</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 MANUAL_HANDOVER_STR "Manually trigger handover (for debugging)\n"</span><br><span> #define MANUAL_ASSIGNMENT_STR "Manually trigger assignment (for debugging)\n"</span><br><span> </span><br><span>@@ -6023,34 +6072,6 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* resolve a gsm_bts_trx_ts basd on the given numeric identifiers */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts_trx_ts *vty_get_ts(struct vty *vty, const char *bts_str, const char *trx_str,</span><br><span style="color: hsl(0, 100%, 40%);">- const char *ts_str)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int bts_nr = atoi(bts_str);</span><br><span style="color: hsl(0, 100%, 40%);">- int trx_nr = atoi(trx_str);</span><br><span style="color: hsl(0, 100%, 40%);">- int ts_nr = atoi(ts_str);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- trx = gsm_bts_trx_num(bts, trx_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!trx) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts = &trx->ts[ts_nr];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> DEFUN(pdch_act, pdch_act_cmd,</span><br><span> "bts <0-255> trx <0-255> timeslot <0-7> pdch (activate|deactivate)",</span><br><span> BTS_NR_TRX_TS_STR2</span><br><span>@@ -6421,6 +6442,40 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(vamos_modify_lchan, vamos_modify_lchan_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> modify (vamos|non-vamos) " TSC_ARGS_OPT,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_NR_TRX_TS_SS_STR2</span><br><span style="color: hsl(120, 100%, 40%);">+ "Manually send Channel Mode Modify (for debugging)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Enable VAMOS channel mode\n" "Disable VAMOS channel mode\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ TSC_ARGS_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts_trx_ts *ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_lchan *lchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ss_nr = atoi(argv[3]);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *vamos_str = argv[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* argv[5] is the "tsc" string from TSC_ARGS_OPT */</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc_set = (argc > 6) ? atoi(argv[6]) : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsc = (argc > 7) ? atoi(argv[7]) : -1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = vty_get_ts(vty, argv[0], argv[1], argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ss_nr >= ts->max_primary_lchans) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Invalid sub-slot number for this timeslot type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!osmo_bts_has_feature(&ts->trx->bts->features, BTS_FEAT_VAMOS)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS does not support VAMOS%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan = &ts->lchan[ss_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return trigger_vamos_mode_modify(vty, lchan, strcmp(vamos_str, "vamos") == 0, tsc_set, tsc);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Debug command to send lchans from state LCHAN_ST_UNUSED to state</span><br><span> * LCHAN_ST_BORKEN and vice versa. */</span><br><span> DEFUN_HIDDEN(lchan_set_borken, lchan_set_borken_cmd,</span><br><span>@@ -7982,6 +8037,7 @@</span><br><span> install_element(ENABLE_NODE, &lchan_act_all_cmd);</span><br><span> install_element(ENABLE_NODE, &lchan_act_all_bts_cmd);</span><br><span> install_element(ENABLE_NODE, &lchan_act_all_trx_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(ENABLE_NODE, &vamos_modify_lchan_cmd);</span><br><span> install_element(ENABLE_NODE, &lchan_mdcx_cmd);</span><br><span> install_element(ENABLE_NODE, &lchan_set_borken_cmd);</span><br><span> </span><br><span>diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty</span><br><span>index 560fb36..e03ed03 100644</span><br><span>--- a/tests/osmo-bsc.vty</span><br><span>+++ b/tests/osmo-bsc.vty</span><br><span>@@ -1,5 +1,34 @@</span><br><span> OsmoBSC> enable</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# list</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> modify (vamos|non-vamos) [tsc] [<1-4>] [<0-7>]</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ activate Manual Channel Activation (e.g. for BER test)</span><br><span style="color: hsl(120, 100%, 40%);">+ deactivate Manual Channel Deactivation (e.g. for BER test)</span><br><span style="color: hsl(120, 100%, 40%);">+ modify Manually send Channel Mode Modify (for debugging)</span><br><span style="color: hsl(120, 100%, 40%);">+ mdcx Modify RTP Connection</span><br><span style="color: hsl(120, 100%, 40%);">+ handover Manually trigger handover (for debugging)</span><br><span style="color: hsl(120, 100%, 40%);">+ assignment Manually trigger assignment (for debugging)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify ?</span><br><span style="color: hsl(120, 100%, 40%);">+ vamos Enable VAMOS channel mode</span><br><span style="color: hsl(120, 100%, 40%);">+ non-vamos Disable VAMOS channel mode</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify vamos ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [tsc] Provide specific TSC Set and Training Sequence Code</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify vamos tsc ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<1-4>] TSC Set</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify vamos tsc 1 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ [<0-7>] Training Sequence Code</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC# bts 0 trx 0 timeslot 0 sub-slot 0 modify vamos tsc 1 0 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ <cr> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC# configure terminal</span><br><span> OsmoBSC(config)# network</span><br><span> OsmoBSC(config-net)# list</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24625">change 24625</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/+/24625"/><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: If44c3483d4d3d86f5822c5ad882aaeeaff27e3af </div>
<div style="display:none"> Gerrit-Change-Number: 24625 </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>