<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/18449">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add '-d' command line argument to configure stderr logging verbosity<br><br>The '-d' option is pretty much tradition in most osmocom programs,<br>particularly for those without a VTY / config file it is the only<br>option to configure per-subsystem logging verbosity.<br><br>Change-Id: I0abecc26a5d8b6a5607e1eb8982af4c05909afed<br>---<br>M src/bankd/bankd_main.c<br>M src/client/remsim_client_main.c<br>M src/server/remsim_server.c<br>3 files changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>index b3e38b3..ce34ac2 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -271,6 +271,7 @@</span><br><span> printf(</span><br><span> " -h --help Print this help message\n"</span><br><span> " -V --version Print the version of the program\n"</span><br><span style="color: hsl(120, 100%, 40%);">+" -d --debug option Enable debug logging (e.g. DMAIN:DST2)\n"</span><br><span> " -i --server-host A.B.C.D remsim-server IP address (default: 127.0.0.1)\n"</span><br><span> " -p --server-port <1-65535> remsim-server TCP port (default: 9998)\n"</span><br><span> " -b --bank-id <1-65535> Bank Identifier of this SIM bank (default: 1)\n"</span><br><span>@@ -292,6 +293,7 @@</span><br><span> static const struct option long_options[] = {</span><br><span> { "help", 0, 0, 'h' },</span><br><span> { "version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "debug", 1, 0, 'd' },</span><br><span> { "server-host", 1, 0, 'i' },</span><br><span> { "server-port", 1, 0, 'p' },</span><br><span> { "bank-id", 1, 0, 'b' },</span><br><span>@@ -302,7 +304,7 @@</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, "hVi:o:b:n:N:I:P:", long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hVd:i:o:b:n:N:I:P:", long_options, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span> </span><br><span>@@ -315,6 +317,9 @@</span><br><span> printf("osmo-remsim-bankd version %s\n", VERSION);</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'i':</span><br><span> g_bankd->srvc.server_host = optarg;</span><br><span> break;</span><br><span>diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c</span><br><span>index 6587e6b..bc916b9 100644</span><br><span>--- a/src/client/remsim_client_main.c</span><br><span>+++ b/src/client/remsim_client_main.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> printf(</span><br><span> " -h --help Print this help message\n"</span><br><span> " -v --version Print program version\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -d --debug option Enable debug logging (e.g. DMAIN:DST2)\n"</span><br><span> " -i --server-ip A.B.C.D remsim-server IP address\n"</span><br><span> " -p --server-port 13245 remsim-server TCP port\n"</span><br><span> " -c --client-id <0-65535> RSPRO ClientId of this client\n"</span><br><span>@@ -50,6 +51,7 @@</span><br><span> static const struct option long_options[] = {</span><br><span> { "help", 0, 0, 'h' },</span><br><span> { "version", 0, 0, 'v' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "debug", 1, 0, 'd' },</span><br><span> { "server-ip", 1, 0, 'i' },</span><br><span> { "server-port", 1, 0, 'p' },</span><br><span> { "client-id", 1, 0, 'c' },</span><br><span>@@ -68,7 +70,7 @@</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, "hvi:p:c:n:e:"</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hvd:i:p:c:n:e:"</span><br><span> #ifdef USB_SUPPORT</span><br><span> "V:P:C:I:S:A:H:"</span><br><span> #endif</span><br><span>@@ -86,6 +88,9 @@</span><br><span> printf("osmo-remsim-client version %s\n", VERSION);</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'i':</span><br><span> osmo_talloc_replace_string(cfg, &cfg->server_host, optarg);</span><br><span> break;</span><br><span>diff --git a/src/server/remsim_server.c b/src/server/remsim_server.c</span><br><span>index 9d3268f..be853a1 100644</span><br><span>--- a/src/server/remsim_server.c</span><br><span>+++ b/src/server/remsim_server.c</span><br><span>@@ -33,6 +33,7 @@</span><br><span> printf( " Some useful help...\n"</span><br><span> " -h --help This text\n"</span><br><span> " -V --version Print version of the program\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -d --debug option Enable debug logging (e.g. DMAIN:DST2)\n"</span><br><span> );</span><br><span> }</span><br><span> </span><br><span>@@ -43,10 +44,11 @@</span><br><span> static struct option long_options[] = {</span><br><span> { "help", 0, 0, 'h' },</span><br><span> { "version", 0, 0, 'V' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "debug", 1, 0, 'd' },</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, "hV", long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hVd:", long_options, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span> </span><br><span>@@ -55,6 +57,9 @@</span><br><span> print_help();</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'd':</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'V':</span><br><span> printf("osmo-resmim-server version %s\n", VERSION);</span><br><span> exit(0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/18449">change 18449</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-remsim/+/18449"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0abecc26a5d8b6a5607e1eb8982af4c05909afed </div>
<div style="display:none"> Gerrit-Change-Number: 18449 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>