<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add command-line options<br><br>Related: OS#2545<br>Change-Id: I41bca9e1b88bb130870d078ed3f499e39e0bf5d3<br>---<br>M src/osmo-bsc-nat/main.c<br>1 file changed, 65 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-nat refs/changes/60/26660/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c</span><br><span>index 813909b..1edc134 100644</span><br><span>--- a/src/osmo-bsc-nat/main.c</span><br><span>+++ b/src/osmo-bsc-nat/main.c</span><br><span>@@ -19,6 +19,8 @@</span><br><span> </span><br><span> #include "config.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <getopt.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <osmocom/core/application.h></span><br><span> #include <osmocom/vty/cpu_sched_vty.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span>@@ -47,7 +49,59 @@</span><br><span> .go_parent_cb = bsc_nat_vty_go_parent,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void main_vty_init()</span><br><span style="color: hsl(120, 100%, 40%);">+static struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *config_file;</span><br><span style="color: hsl(120, 100%, 40%);">+} bsc_nat_cmdline_config = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .config_file = "osmo-bsc-nat.cfg",</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%);">+static void print_help()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("usage: osmo-bsc-nat <options>\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("optional arguments:\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -h, --help show this help message and exit\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -c, --config-file the config file to use\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(" -V, --version show version number and exit\n");</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%);">+static void handle_options(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int idx = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ static const struct option long_options[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ {"help", 0, 0, 'h'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"config-file", 1, 0, 'c'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, 0, 0, 0 },</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%);">+ c = getopt_long(argc, argv, "hc:V", long_options, &idx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (c == -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (c) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'h':</span><br><span style="color: hsl(120, 100%, 40%);">+ print_help();</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'c':</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_nat_cmdline_config.config_file = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'V':</span><br><span style="color: hsl(120, 100%, 40%);">+ print_version(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</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%);">+ exit(-1);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void main_vty_init(int argc, char **argv)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -61,6 +115,15 @@</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> osmo_cpu_sched_vty_init(tall_bsc_nat_ctx);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = vty_read_config_file(bsc_nat_cmdline_config.config_file, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Failed to parse the config file: '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_nat_cmdline_config.config_file);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = telnet_init_dynif(tall_bsc_nat_ctx, g_bsc_nat, vty_get_bind_addr(), OSMO_VTY_PORT_BSC_NAT);</span><br><span> if (rc < 0) {</span><br><span> perror("Error binding VTY port");</span><br><span>@@ -81,7 +144,7 @@</span><br><span> </span><br><span> g_bsc_nat = bsc_nat_alloc(tall_bsc_nat_ctx);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- main_vty_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ main_vty_init(argc, argv);</span><br><span> </span><br><span> while (!osmo_select_shutdown_done())</span><br><span> osmo_select_main_ctx(0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660">change 26660</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-nat/+/26660"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc-nat </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I41bca9e1b88bb130870d078ed3f499e39e0bf5d3 </div>
<div style="display:none"> Gerrit-Change-Number: 26660 </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>