<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19550">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: ensure that all warning messages are prefixed with '%%'<br><br>Change-Id: I6f2348c481ed43904d05b42fd7d5ce04dedbf46b<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 57 insertions(+), 55 deletions(-)<br><br></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 e4842f7..c1228be 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1771,7 +1771,7 @@</span><br><span> }</span><br><span> </span><br><span> if (!new_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to trigger handover, specified bts #%u does not exist %s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to trigger handover, specified bts #%u does not exist %s",</span><br><span> bts_nr_new, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -1793,7 +1793,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to trigger %s, specified connection (bts=%u,trx=%u,ts=%u,ss=%u) does not exist%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to trigger %s, specified connection (bts=%u,trx=%u,ts=%u,ss=%u) does not exist%s",</span><br><span> action, bts_nr, trx_nr, ts_nr, ss_nr, VTY_NEWLINE);</span><br><span> </span><br><span> return CMD_WARNING;</span><br><span>@@ -1865,7 +1865,7 @@</span><br><span> random_idx %= count;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot find any ongoing voice calls%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot find any ongoing voice calls%s", VTY_NEWLINE);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -1892,7 +1892,7 @@</span><br><span> return bts;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Cannot find any BTS (other than BTS %u) with free %s lchan%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot find any BTS (other than BTS %u) with free %s lchan%s",</span><br><span> not_this_bts? not_this_bts->nr : 255, gsm_lchant_name(free_type), VTY_NEWLINE);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -2036,7 +2036,7 @@</span><br><span> </span><br><span> page_group = gsm0502_calc_paging_group(&bts->si_common.chan_desc,</span><br><span> str_to_imsi(argv[1]));</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%%Paging group for IMSI %" PRIu64 " on BTS #%d is %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Paging group for IMSI %" PRIu64 " on BTS #%d is %u%s",</span><br><span> str_to_imsi(argv[1]), bts->nr,</span><br><span> page_group, VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -3197,7 +3197,7 @@</span><br><span> enum bts_gprs_mode mode = bts_gprs_mode_parse(argv[0], NULL);</span><br><span> </span><br><span> if (!bts_gprs_mode_is_compat(bts, mode)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This BTS type does not support %s%s", argv[0],</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This BTS type does not support %s%s", argv[0],</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3305,7 +3305,7 @@</span><br><span> </span><br><span> type = get_string_value(osmo_sitype_strs, argv[0]);</span><br><span> if (type < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error SI Type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error SI Type%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3328,12 +3328,12 @@</span><br><span> </span><br><span> type = get_string_value(osmo_sitype_strs, argv[0]);</span><br><span> if (type < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error SI Type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error SI Type%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (!(bts->si_mode_static & (1 << type))) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "SI Type %s is not configured in static mode%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% SI Type %s is not configured in static mode%s",</span><br><span> get_value_string(osmo_sitype_strs, type), VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3344,7 +3344,7 @@</span><br><span> /* Parse the user-specified SI in hex format, [partially] overwriting padding */</span><br><span> rc = osmo_hexparse(argv[1], GSM_BTS_SI(bts, type), GSM_MACBLOCK_LEN);</span><br><span> if (rc < 0 || rc > GSM_MACBLOCK_LEN) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3376,7 +3376,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span> if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This command is only intended for ipaccess nanoBTS. See OS#3707.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command is only intended for ipaccess nanoBTS. See OS#3707.%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3497,24 +3497,24 @@</span><br><span> </span><br><span> switch (r) {</span><br><span> case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: multiple threshold-high are not supported, overriding with %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: multiple threshold-high are not supported, overriding with %u%s",</span><br><span> thresh_hi, VTY_NEWLINE);</span><br><span> break;</span><br><span> case EARFCN_THRESH_LOW_INVALID:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: multiple threshold-low are not supported, overriding with %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: multiple threshold-low are not supported, overriding with %u%s",</span><br><span> thresh_lo, VTY_NEWLINE);</span><br><span> break;</span><br><span> case EARFCN_QRXLV_INVALID + 1:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: multiple QRXLEVMIN are not supported, overriding with %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: multiple QRXLEVMIN are not supported, overriding with %u%s",</span><br><span> qrx, VTY_NEWLINE);</span><br><span> break;</span><br><span> case EARFCN_PRIO_INVALID:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: multiple priorities are not supported, overriding with %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: multiple priorities are not supported, overriding with %u%s",</span><br><span> prio, VTY_NEWLINE);</span><br><span> break;</span><br><span> default:</span><br><span> if (r < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to add ARFCN %u: %s%s", arfcn, strerror(-r), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to add ARFCN %u: %s%s", arfcn, strerror(-r), VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> }</span><br><span>@@ -3522,7 +3522,7 @@</span><br><span> if (si2q_num(bts) <= SI2Q_MAX_NUM)</span><br><span> return CMD_SUCCESS;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: not enough space in SI2quater (%u/%u used) for a given EARFCN %u%s",</span><br><span> bts->si2q_count, SI2Q_MAX_NUM, arfcn, VTY_NEWLINE);</span><br><span> osmo_earfcn_del(e, arfcn);</span><br><span> </span><br><span>@@ -3542,7 +3542,7 @@</span><br><span> uint16_t arfcn = atoi(argv[0]);</span><br><span> int r = osmo_earfcn_del(e, arfcn);</span><br><span> if (r < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to delete arfcn %u: %s%s", arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to delete arfcn %u: %s%s", arfcn,</span><br><span> strerror(-r), VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3562,14 +3562,16 @@</span><br><span> </span><br><span> switch(bts_uarfcn_add(bts, arfcn, scramble, atoi(argv[2]))) {</span><br><span> case -ENOMEM:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to add UARFCN: max number of UARFCNs (%u) reached%s", MAX_EARFCN_LIST, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to add UARFCN: max number of UARFCNs (%u) reached%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ MAX_EARFCN_LIST, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> case -ENOSPC:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Warning: not enough space in SI2quater for a given UARFCN (%u, %u)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Warning: not enough space in SI2quater for a given UARFCN (%u, %u)%s",</span><br><span> arfcn, scramble, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> case -EADDRINUSE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to add UARFCN: (%u, %u) is already added%s", arfcn, scramble, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to add UARFCN: (%u, %u) is already added%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn, scramble, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3588,7 +3590,7 @@</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span> if (bts_uarfcn_del(bts, atoi(argv[0]), atoi(argv[1])) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to delete uarfcn: pair not found%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to delete uarfcn: pair not found%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3734,9 +3736,9 @@</span><br><span> error = acc_ramp_set_step_interval(&bts->acc_ramp, atoi(argv[0]));</span><br><span> if (error != 0) {</span><br><span> if (error == -ERANGE)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to set ACC ramp step interval: value out of range%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set ACC ramp step interval: value out of range%s", VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to set ACC ramp step interval: unknown error%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set ACC ramp step interval: unknown error%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3757,9 +3759,9 @@</span><br><span> error = acc_ramp_set_step_size(&bts->acc_ramp, atoi(argv[0]));</span><br><span> if (error != 0) {</span><br><span> if (error == -ERANGE)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to set ACC ramp step size: value out of range%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set ACC ramp step size: value out of range%s", VTY_NEWLINE);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to set ACC ramp step size: unknown error%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set ACC ramp step size: unknown error%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3778,7 +3780,7 @@</span><br><span> </span><br><span> rc = acc_ramp_set_chan_load_thresholds(&bts->acc_ramp, atoi(argv[0]), atoi(argv[1]));</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Unable to set ACC channel load thresholds%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set ACC channel load thresholds%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -3909,20 +3911,20 @@</span><br><span> </span><br><span> </span><br><span> if (!is_ipaccess_bts(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This feature is only available for IP systems.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This feature is only available for IP systems.%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> other_bts = gsm_bts_num(bts->network, dep);</span><br><span> if (!other_bts || !is_ipaccess_bts(other_bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This feature is only available for IP systems.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This feature is only available for IP systems.%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (dep >= bts->nr) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%%Need to depend on an already declared unit.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Need to depend on an already declared unit.%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -3964,13 +3966,13 @@</span><br><span> for (i = 0; i < argc; i++) {</span><br><span> mode = atoi(argv[i]);</span><br><span> if (mode_prev > mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Modes must be listed in order%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Modes must be listed in order%s",</span><br><span> VTY_NEWLINE);</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span> if (mode_prev == mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Modes must be unique %s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Modes must be unique %s", VTY_NEWLINE);</span><br><span> return -2;</span><br><span> }</span><br><span> mode_prev = mode;</span><br><span>@@ -4063,7 +4065,7 @@</span><br><span> rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (tch-f, ms) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (tch-f, ms) - check parameters%s",</span><br><span> VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span>@@ -4071,7 +4073,7 @@</span><br><span> rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (tch-f, bts) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (tch-f, bts) - check parameters%s",</span><br><span> VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span>@@ -4081,7 +4083,7 @@</span><br><span> rc = gsm48_multirate_config(NULL, mr_conf, mr->ms_mode, mr->num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (tch-h, ms) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (tch-h, ms) - check parameters%s",</span><br><span> VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span>@@ -4089,7 +4091,7 @@</span><br><span> rc = gsm48_multirate_config(NULL, mr_conf, mr->bts_mode, mr->num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (tch-h, bts) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (tch-h, bts) - check parameters%s",</span><br><span> VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span>@@ -4330,7 +4332,7 @@</span><br><span> bts->T3113_dynamic = true;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "T%d cannot be set to dynamic%s", d->T, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% T%d cannot be set to dynamic%s", d->T, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4356,7 +4358,7 @@</span><br><span> bts->T3113_dynamic = false;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "T%d already is non-dynamic%s", d->T, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% T%d already is non-dynamic%s", d->T, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4613,7 +4615,7 @@</span><br><span> int enabled = atoi(argv[0]);</span><br><span> </span><br><span> if (enabled && !osmo_bts_has_feature(&ts->trx->bts->model->features, BTS_FEAT_HOPPING)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS model does not support hopping%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS model does not support hopping%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -4742,19 +4744,19 @@</span><br><span> </span><br><span> bts_nr = atoi(argv[0]);</span><br><span> if (bts_nr >= gsmnet->num_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",</span><br><span> gsmnet->num_bts, bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> bts = gsm_bts_num(gsmnet, bts_nr);</span><br><span> if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (!is_ipaccess_bts(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This command only works for ipaccess.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command only works for ipaccess.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4768,7 +4770,7 @@</span><br><span> ipaccess_drop_rsl(trx, "vty");</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Argument must be 'oml# or 'rsl'.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4789,19 +4791,19 @@</span><br><span> </span><br><span> bts_nr = atoi(argv[0]);</span><br><span> if (bts_nr >= gsmnet->num_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",</span><br><span> gsmnet->num_bts, bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> bts = gsm_bts_num(gsmnet, bts_nr);</span><br><span> if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "This command only works for ipaccess nanoBTS.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% This command only works for ipaccess nanoBTS.%s",</span><br><span> VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span>@@ -4826,14 +4828,14 @@</span><br><span> </span><br><span> bts_nr = atoi(argv[0]);</span><br><span> if (bts_nr >= gsmnet->num_bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS number must be between 0 and %d. It was %d.%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS number must be between 0 and %d. It was %d.%s",</span><br><span> gsmnet->num_bts, bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> bts = gsm_bts_num(gsmnet, bts_nr);</span><br><span> if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS Nr. %d could not be found.%s", bts_nr, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4872,7 +4874,7 @@</span><br><span> }</span><br><span> rc = osmo_hexparse(argv[3], buf, sizeof(buf));</span><br><span> if (rc < 0 || rc > sizeof(buf)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error parsing HEXSTRING%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4885,7 +4887,7 @@</span><br><span> else if (!strcmp(type_str, "default"))</span><br><span> cb_cmd.command = RSL_CB_CMD_TYPE_DEFAULT;</span><br><span> else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error parsing type%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error parsing type%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -4903,7 +4905,7 @@</span><br><span> cb_cmd.last_block = RSL_CB_CMD_LASTBLOCK_4;</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Error parsing LASTBLOCK%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error parsing LASTBLOCK%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -5019,14 +5021,14 @@</span><br><span> rc = gsm48_multirate_config(lchan->mr_ms_lv, mr_conf, mr.ms_mode, mr.num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (%s, amr mode %d, ms) - check parameters%s",</span><br><span> gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span> rc = gsm48_multirate_config(lchan->mr_bts_lv, mr_conf, mr.bts_mode, mr.num_modes);</span><br><span> if (rc != 0) {</span><br><span> vty_out(vty,</span><br><span style="color: hsl(0, 100%, 40%);">- "Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ "%% Invalid AMR multirate configuration (%s, amr mode %d, bts) - check parameters%s",</span><br><span> gsm_lchant_name(lchan->type), amr_mode, VTY_NEWLINE);</span><br><span> vty_rc = CMD_WARNING;</span><br><span> }</span><br><span>@@ -5485,7 +5487,7 @@</span><br><span> </span><br><span> msc = osmo_msc_data_alloc(bsc_gsmnet, index);</span><br><span> if (!msc) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%%Failed to allocate MSC data.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Failed to allocate MSC data.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span>@@ -6141,7 +6143,7 @@</span><br><span> bsc_subscr = bsc_subscr_find_or_create_by_imsi(bsc_gsmnet->bsc_subscribers, imsi);</span><br><span> </span><br><span> if (!bsc_subscr) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%%failed to enable logging for subscriber with IMSI(%s)%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% failed to enable logging for subscriber with IMSI(%s)%s",</span><br><span> imsi, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/19550">change 19550</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/+/19550"/><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: I6f2348c481ed43904d05b42fd7d5ce04dedbf46b </div>
<div style="display:none"> Gerrit-Change-Number: 19550 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>