<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16479">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add "--version" to all executables to print compile-time version info<br><br>Change-Id: I9ae504ff95beeefb9e90e02a576861351ea9e143<br>---<br>M src/bankd/bankd_main.c<br>M src/server/remsim_server.c<br>M src/simtrace2-remsim_client.c<br>3 files changed, 62 insertions(+), 2 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 09a9e1d..82ed8c0 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -243,6 +243,7 @@</span><br><span> {</span><br><span> printf(</span><br><span> " -h --help Print this help message\n"</span><br><span style="color: hsl(120, 100%, 40%);">+" -V --version Print the version of the program\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>@@ -263,6 +264,7 @@</span><br><span> int option_index = 0, c;</span><br><span> static const struct option long_options[] = {</span><br><span> { "help", 0, 0, 'h' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "version", 0, 0, 'V' },</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>@@ -273,7 +275,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, "hi:o:b:n:N:I:P:", long_options, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "hVi: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>@@ -282,6 +284,10 @@</span><br><span> printf_help();</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'V':</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo-remsim-bankd version %s\n", VERSION);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</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/server/remsim_server.c b/src/server/remsim_server.c</span><br><span>index 70cbedc..9d3268f 100644</span><br><span>--- a/src/server/remsim_server.c</span><br><span>+++ b/src/server/remsim_server.c</span><br><span>@@ -1,6 +1,9 @@</span><br><span> #include <unistd.h></span><br><span> #include <signal.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define _GNU_SOURCE</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 <sys/eventfd.h></span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span>@@ -25,6 +28,49 @@</span><br><span> talloc_report_full(g_tall_ctx, stderr);</span><br><span> }</span><br><span> </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( " Some useful help...\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -h --help This text\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -V --version Print version of the program\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%);">+</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 option_index = 0, c;</span><br><span style="color: hsl(120, 100%, 40%);">+ static 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%);">+ { "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, "hV", long_options, &option_index);</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 'V':</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo-resmim-server version %s\n", VERSION);</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%);">+ /* ignore */</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%);">+ if (argc > optind) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unsupported extra positional arguments in command line\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(2);</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> int main(int argc, char **argv)</span><br><span> {</span><br><span> void *talloc_rest_ctx;</span><br><span>@@ -37,6 +83,8 @@</span><br><span> </span><br><span> osmo_init_logging2(g_tall_ctx, &log_info);</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> g_rps = rspro_server_create(g_tall_ctx, "0.0.0.0", 9998);</span><br><span> if (!g_rps)</span><br><span> exit(1);</span><br><span>diff --git a/src/simtrace2-remsim_client.c b/src/simtrace2-remsim_client.c</span><br><span>index e97ed9d..69d6a04 100644</span><br><span>--- a/src/simtrace2-remsim_client.c</span><br><span>+++ b/src/simtrace2-remsim_client.c</span><br><span>@@ -696,6 +696,7 @@</span><br><span> "\t-c\t--client-id <0-65535>\n"</span><br><span> "\t-n\t--client-slot <0-65535>\n"</span><br><span> "\t-h\t--help\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "\t-v\t--version\n"</span><br><span> "\t-i\t--gsmtap-ip\tA.B.C.D\n"</span><br><span> "\t-k\t--keep-running\n"</span><br><span> "\t-V\t--usb-vendor\tVENDOR_ID\n"</span><br><span>@@ -716,6 +717,7 @@</span><br><span> { "client-id", 1, 0, 'c' },</span><br><span> { "client-slot", 1, 0, 'n' },</span><br><span> { "help", 0, 0, 'h' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "version", 0, 0, 'v' },</span><br><span> { "gsmtap-ip", 1, 0, 'i' },</span><br><span> { "keep-running", 0, 0, 'k' },</span><br><span> { "usb-vendor", 1, 0, 'V' },</span><br><span>@@ -751,7 +753,7 @@</span><br><span> while (1) {</span><br><span> int option_index = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "s:p:c:n:hi:kV:P:C:I:S:A:H:a:", opts, &option_index);</span><br><span style="color: hsl(120, 100%, 40%);">+ c = getopt_long(argc, argv, "s:p:c:n:hvi:kV:P:C:I:S:A:H:a:", opts, &option_index);</span><br><span> if (c == -1)</span><br><span> break;</span><br><span> switch (c) {</span><br><span>@@ -771,6 +773,10 @@</span><br><span> print_help();</span><br><span> exit(0);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'v':</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("osmo-remsim-client version %s\n", VERSION);</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case 'i':</span><br><span> gsmtap_host = optarg;</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16479">change 16479</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/+/16479"/><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: I9ae504ff95beeefb9e90e02a576861351ea9e143 </div>
<div style="display:none"> Gerrit-Change-Number: 16479 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>