<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17491">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">main: exit on mutually exclusive codecs settings<br><br>Refuse to start with mutually exclusive codec settings, unless<br>--allow-unusable-timeslots command-line argument is set. The checks were<br>already implemented and fill the error log if the config is invalid.<br><br>Related: OS#3739<br>Change-Id: I3ccfc3b0a8641400cb97a23b24d7ed92d2ad25cd<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 11 insertions(+), 2 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/91/17491/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 66310b3..6a1d5ec 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -84,6 +84,7 @@</span><br><span> static const char *config_file = "osmo-bsc.cfg";</span><br><span> static const char *rf_ctrl = NULL;</span><br><span> static int daemonize = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+static int allow_unusable_timeslots = 0;</span><br><span> static LLIST_HEAD(access_lists);</span><br><span> </span><br><span> struct llist_head *bsc_access_lists(void)</span><br><span>@@ -110,6 +111,7 @@</span><br><span>         printf("  -e --log-level number            Set a global loglevel.\n");</span><br><span>     printf("  -r --rf-ctl NAME         A unix domain socket to listen for cmds.\n");</span><br><span>   printf("  -t --testmode                    A special mode to provoke failures at the MSC.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+      printf("  -a --allow-unusable-timeslots Don't refuse to start with mutually exclusive codec settings.\n");</span><br><span> }</span><br><span> </span><br><span> static void handle_options(int argc, char **argv)</span><br><span>@@ -128,10 +130,11 @@</span><br><span>                       {"log-level", 1, 0, 'e'},</span><br><span>                  {"rf-ctl", 1, 0, 'r'},</span><br><span>                     {"testmode", 0, 0, 't'},</span><br><span style="color: hsl(120, 100%, 40%);">+                    {"allow-unusable-timeslots", 0, 0, 'a'},</span><br><span>                   {0, 0, 0, 0}</span><br><span>                 };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-          c = getopt_long(argc, argv, "hd:DsTVc:e:r:t",</span><br><span style="color: hsl(120, 100%, 40%);">+               c = getopt_long(argc, argv, "hd:DsTVc:e:r:ta",</span><br><span>                             long_options, &option_index);</span><br><span>            if (c == -1)</span><br><span>                         break;</span><br><span>@@ -166,6 +169,9 @@</span><br><span>                 case 'r':</span><br><span>                    rf_ctrl = optarg;</span><br><span>                    break;</span><br><span style="color: hsl(120, 100%, 40%);">+                case 'a':</span><br><span style="color: hsl(120, 100%, 40%);">+                     allow_unusable_timeslots = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+                 break;</span><br><span>               default:</span><br><span>                     /* ignore */</span><br><span>                         break;</span><br><span>@@ -902,8 +908,11 @@</span><br><span>        }</span><br><span> </span><br><span>        rc = check_codec_pref(&bsc_gsmnet->bsc_data->mscs);</span><br><span style="color: hsl(0, 100%, 40%);">-   if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+        if (rc < 0) {</span><br><span>             LOGP(DMSC, LOGL_ERROR, "Configuration contains mutually exclusive codec settings -- check configuration!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+               if (!allow_unusable_timeslots)</span><br><span style="color: hsl(120, 100%, 40%);">+                        exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+      }</span><br><span> </span><br><span>        llist_for_each_entry(msc, &bsc_gsmnet->bsc_data->mscs, entry) {</span><br><span>            if (osmo_bsc_msc_init(msc) != 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/17491">change 17491</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/+/17491"/><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: I3ccfc3b0a8641400cb97a23b24d7ed92d2ad25cd </div>
<div style="display:none"> Gerrit-Change-Number: 17491 </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>