<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17159">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Split into remsim_client.c and remsim_client_main.c<br><br>Change-Id: Ie1d21c2cd84756d5c8aa2c41bcc37f5951a3a285<br>---<br>M src/client/Makefile.am<br>M src/client/remsim_client.c<br>A src/client/remsim_client_main.c<br>3 files changed, 99 insertions(+), 99 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/Makefile.am b/src/client/Makefile.am</span><br><span>index ec99818..ac0d707 100644</span><br><span>--- a/src/client/Makefile.am</span><br><span>+++ b/src/client/Makefile.am</span><br><span>@@ -6,7 +6,7 @@</span><br><span> </span><br><span> bin_PROGRAMS = osmo-remsim-client-st2 osmo-remsim-client-shell</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo_remsim_client_shell_SOURCES = user_shell.c \</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_remsim_client_shell_SOURCES = user_shell.c remsim_client_main.c \</span><br><span> remsim_client.c ../rspro_client_fsm.c ../debug.c</span><br><span> osmo_remsim_client_shell_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOABIS_LIBS) \</span><br><span> $(top_builddir)/src/libosmo-rspro.la</span><br><span>diff --git a/src/client/remsim_client.c b/src/client/remsim_client.c</span><br><span>index 7ff8f37..07ffbde 100644</span><br><span>--- a/src/client/remsim_client.c</span><br><span>+++ b/src/client/remsim_client.c</span><br><span>@@ -159,101 +159,3 @@</span><br><span> bc->bankd_conn.clslot->slotNr = slot_nr;</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <signal.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <unistd.h></span><br><span style="color: hsl(0, 100%, 40%);">-#define _GNU_SOURCE</span><br><span style="color: hsl(0, 100%, 40%);">-#include <getopt.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/application.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void *g_tall_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-void __thread *talloc_asn1_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-int asn_debug;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void handle_sig_usr1(int signal)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(signal == SIGUSR1);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_report_full(g_tall_ctx, stderr);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void printf_help()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- printf(</span><br><span style="color: hsl(0, 100%, 40%);">- " -h --help Print this help message\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -i --server-ip A.B.C.D remsim-server IP address\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -p --server-port 13245 remsim-server TCP port\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -i --client-id <0-65535> RSPRO ClientId of this client\n"</span><br><span style="color: hsl(0, 100%, 40%);">- " -n --client-slot <0-65535> RSPRO SlotNr of this client\n"</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void handle_options(struct bankd_client *bc, int argc, char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- int option_index = 0, c;</span><br><span style="color: hsl(0, 100%, 40%);">- static const struct option long_options[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { "help", 0, 0, 'h' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "server-ip", 1, 0, 'i' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "server-port", 1, 0, 'p' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "client-id", 1, 0, 'c' },</span><br><span style="color: hsl(0, 100%, 40%);">- { "client-slot", 1, 0, 'n' },</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, 0, 0, 0 }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- c = getopt_long(argc, argv, "hi:p:c:n:",</span><br><span style="color: hsl(0, 100%, 40%);">- long_options, &option_index);</span><br><span style="color: hsl(0, 100%, 40%);">- if (c == -1)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (c) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'h':</span><br><span style="color: hsl(0, 100%, 40%);">- printf_help();</span><br><span style="color: hsl(0, 100%, 40%);">- exit(0);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'i':</span><br><span style="color: hsl(0, 100%, 40%);">- bc->srv_conn.server_host = optarg;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'p':</span><br><span style="color: hsl(0, 100%, 40%);">- bc->srv_conn.server_port = atoi(optarg);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'c':</span><br><span style="color: hsl(0, 100%, 40%);">- remsim_client_set_clslot(bc, atoi(optarg), -1);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case 'n':</span><br><span style="color: hsl(0, 100%, 40%);">- remsim_client_set_clslot(bc, -1, atoi(optarg));</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int main(int argc, char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct bankd_client *g_client;</span><br><span style="color: hsl(0, 100%, 40%);">- char hostname[256];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- gethostname(hostname, sizeof(hostname));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- g_tall_ctx = talloc_named_const(NULL, 0, "global");</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1");</span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- g_client = remsim_client_create(g_tall_ctx, hostname, "remsim-client");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- handle_options(g_client, argc, argv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(g_client->srv_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- signal(SIGUSR1, handle_sig_usr1);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- asn_debug = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- client_user_main(g_client);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/client/remsim_client_main.c b/src/client/remsim_client_main.c</span><br><span>new file mode 100644</span><br><span>index 0000000..95eb089</span><br><span>--- /dev/null</span><br><span>+++ b/src/client/remsim_client_main.c</span><br><span>@@ -0,0 +1,98 @@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <signal.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></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 style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/application.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void __thread *talloc_asn1_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+int asn_debug;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_sig_usr1(int signal)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(signal == SIGUSR1);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_report_full(g_tall_ctx, stderr);</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 printf_help()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ printf(</span><br><span style="color: hsl(120, 100%, 40%);">+ " -h --help Print this help message\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -i --server-ip A.B.C.D remsim-server IP address\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -p --server-port 13245 remsim-server TCP port\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -i --client-id <0-65535> RSPRO ClientId of this client\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ " -n --client-slot <0-65535> RSPRO SlotNr of this client\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(struct bankd_client *bc, 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 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%);">+ { "server-ip", 1, 0, 'i' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "server-port", 1, 0, 'p' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "client-id", 1, 0, 'c' },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "client-slot", 1, 0, 'n' },</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, "hi:p:c:n:",</span><br><span style="color: hsl(120, 100%, 40%);">+ 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%);">+ printf_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 'i':</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.server_host = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'p':</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.server_port = atoi(optarg);</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%);">+ remsim_client_set_clslot(bc, atoi(optarg), -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'n':</span><br><span style="color: hsl(120, 100%, 40%);">+ remsim_client_set_clslot(bc, -1, atoi(optarg));</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%);">+ 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%);">+int main(int argc, char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bankd_client *g_client;</span><br><span style="color: hsl(120, 100%, 40%);">+ char hostname[256];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gethostname(hostname, sizeof(hostname));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_tall_ctx = talloc_named_const(NULL, 0, "global");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1");</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_client = remsim_client_create(g_tall_ctx, hostname, "remsim-client");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(g_client, argc, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(g_client->srv_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ signal(SIGUSR1, handle_sig_usr1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ asn_debug = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ client_user_main(g_client);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17159">change 17159</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/+/17159"/><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: Ie1d21c2cd84756d5c8aa2c41bcc37f5951a3a285 </div>
<div style="display:none"> Gerrit-Change-Number: 17159 </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>