<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17461">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-bsc/bsc_vty: fail on get_amr_from_arg error<br><br>Fail parsing osmo-bsc.cfg if the AMR modes are not in order or not<br>unique.<br><br>Related: OS#4199<br>Change-Id: Ic2f3690396fb0425f6b358e1e21a8b8b56eb3ae0<br>---<br>M src/osmo-bsc/bsc_vty.c<br>1 file changed, 20 insertions(+), 11 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/61/17461/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 d1a268d..dd157c0 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -3717,7 +3717,7 @@</span><br><span> #define AMR_TH_TEXT "AMR threshold between codecs\nMS side\nBTS side\n"</span><br><span> #define AMR_HY_TEXT "AMR hysteresis between codecs\nMS side\nBTS side\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_amr_from_arg(struct vty *vty, int argc, const char *argv[], int full)</span><br><span style="color: hsl(120, 100%, 40%);">+static int get_amr_from_arg(struct vty *vty, int argc, const char *argv[], int full)</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> struct amr_multirate_conf *mr = (full) ? &bts->mr_full: &bts->mr_half;</span><br><span>@@ -3733,12 +3733,12 @@</span><br><span> if (mode_prev > mode) {</span><br><span> vty_out(vty, "Modes must be listed in order%s",</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> if (mode_prev == mode) {</span><br><span> vty_out(vty, "Modes must be unique %s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -2;</span><br><span> }</span><br><span> mode_prev = mode;</span><br><span> }</span><br><span>@@ -3763,6 +3763,7 @@</span><br><span> mr->ms_mode[i].hysteresis = 0;</span><br><span> mr->bts_mode[i].hysteresis = 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> static void get_amr_th_from_arg(struct vty *vty, int argc, const char *argv[], int full)</span><br><span>@@ -3878,7 +3879,8 @@</span><br><span> AMR_TEXT "Full Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHF_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 1, argv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 1, argv, 1))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3887,7 +3889,8 @@</span><br><span> AMR_TEXT "Full Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 2, argv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 2, argv, 1))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3896,7 +3899,8 @@</span><br><span> AMR_TEXT "Full Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 3, argv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 3, argv, 1))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3905,7 +3909,8 @@</span><br><span> AMR_TEXT "Full Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR AMR_TCHF_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 4, argv, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 4, argv, 1))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3976,7 +3981,8 @@</span><br><span> AMR_TEXT "Half Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHH_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 1, argv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 1, argv, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3985,7 +3991,8 @@</span><br><span> AMR_TEXT "Half Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 2, argv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 2, argv, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -3994,7 +4001,8 @@</span><br><span> AMR_TEXT "Half Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 3, argv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 3, argv, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span>@@ -4003,7 +4011,8 @@</span><br><span> AMR_TEXT "Half Rate\n" AMR_MODE_TEXT</span><br><span> AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR AMR_TCHH_HELP_STR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- get_amr_from_arg(vty, 4, argv, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (get_amr_from_arg(vty, 4, argv, 0))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> return check_amr_config(vty);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17461">change 17461</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/+/17461"/><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: Ic2f3690396fb0425f6b358e1e21a8b8b56eb3ae0 </div>
<div style="display:none"> Gerrit-Change-Number: 17461 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>