<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11851">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mobile: abort in case of argv handling errors<br><br>The process should be aborted if a non-existing command line<br>option or an incorrect parameter value is passed.<br><br>Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6<br>---<br>M src/host/layer23/src/mobile/main.c<br>1 file changed, 10 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/51/11851/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c</span><br><span>index 115ac41..e015c30 100644</span><br><span>--- a/src/host/layer23/src/mobile/main.c</span><br><span>+++ b/src/host/layer23/src/mobile/main.c</span><br><span>@@ -99,7 +99,7 @@</span><br><span>               "offer socket\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void handle_options(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+static int handle_options(int argc, char **argv)</span><br><span> {</span><br><span>        while (1) {</span><br><span>          int option_index = 0, c;</span><br><span>@@ -148,9 +148,12 @@</span><br><span>                      use_mncc_sock = 1;</span><br><span>                   break;</span><br><span>               default:</span><br><span style="color: hsl(0, 100%, 40%);">-                        break;</span><br><span style="color: hsl(120, 100%, 40%);">+                        /* Unknown parameter passed */</span><br><span style="color: hsl(120, 100%, 40%);">+                        return -EINVAL;</span><br><span>              }</span><br><span>    }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   return 0;</span><br><span> }</span><br><span> </span><br><span> void sighandler(int sigset)</span><br><span>@@ -218,7 +221,11 @@</span><br><span>     /* Init default stderr logging */</span><br><span>    osmo_init_logging2(l23_ctx, &log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- handle_options(argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+   rc = handle_options(argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+      if (rc) { /* Abort in case of parsing errors */</span><br><span style="color: hsl(120, 100%, 40%);">+               fprintf(stderr, "Error in command line options. Exiting.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+               return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span> </span><br><span>        if (gsmtap_ip) {</span><br><span>             gsmtap_inst = gsmtap_source_init(gsmtap_ip, GSMTAP_UDP_PORT, 1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11851">change 11851</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/11851"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib656ad12f12429ed15dc2a1554901ffa51148ff6 </div>
<div style="display:none"> Gerrit-Change-Number: 11851 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>