<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17158">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;">client: Remove g_client completely; separate 'main' code<br><br>We may want to use the entire client code independent of the current<br>'main' portion, so let's introduce separation via API.<br><br>Change-Id: I6456317c3968551cd69ba379c746e4dd9690d02d<br>---<br>M src/client/client.h<br>M src/client/remsim_client.c<br>2 files changed, 92 insertions(+), 60 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/client.h b/src/client/client.h</span><br><span>index 0239b55..80381fa 100644</span><br><span>--- a/src/client/client.h</span><br><span>+++ b/src/client/client.h</span><br><span>@@ -61,6 +61,9 @@</span><br><span> #define srvc2bankd_client(srvc) container_of(srvc, struct bankd_client, srv_conn)</span><br><span> #define bankdc2bankd_client(bdc) container_of(bdc, struct bankd_client, bankd_conn)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct bankd_client *remsim_client_create(void *ctx, const char *name, const char *software);</span><br><span style="color: hsl(120, 100%, 40%);">+void remsim_client_set_clslot(struct bankd_client *bc, int client_id, int slot_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> extern int client_user_bankd_handle_rx(struct rspro_server_conn *bankdc, const RsproPDU_t *pdu);</span><br><span> </span><br><span>diff --git a/src/client/remsim_client.c b/src/client/remsim_client.c</span><br><span>index 496e1f4..7ff8f37 100644</span><br><span>--- a/src/client/remsim_client.c</span><br><span>+++ b/src/client/remsim_client.c</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2018-2019 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2018-2020 by Harald Welte <laforge@gnumonks.org></span><br><span> *</span><br><span> * All Rights Reserved</span><br><span> *</span><br><span>@@ -22,21 +22,12 @@</span><br><span> </span><br><span> #include <errno.h></span><br><span> #include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <signal.h></span><br><span style="color: hsl(0, 100%, 40%);">-</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> </span><br><span> #include <talloc.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/logging.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%);">-#include <osmocom/abis/ipa.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/gsm/protocol/ipaccess.h></span><br><span> </span><br><span> #include "rspro_util.h"</span><br><span> #include "client.h"</span><br><span>@@ -62,11 +53,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct bankd_client *g_client;</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> /* handle incoming messages from server */</span><br><span> static int srvc_handle_rx(struct rspro_server_conn *srvc, const RsproPDU_t *pdu)</span><br><span> {</span><br><span>@@ -112,6 +98,82 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct bankd_client *remsim_client_create(void *ctx, const char *name, const char *software)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bankd_client *bc = talloc_zero(ctx, struct bankd_client);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rspro_server_conn *srvc, *bankdc;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bc)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* create and [attempt to] establish connection to remsim-server */</span><br><span style="color: hsl(120, 100%, 40%);">+ srvc = &bc->srv_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ srvc->server_host = "localhost";</span><br><span style="color: hsl(120, 100%, 40%);">+ srvc->server_port = 9998;</span><br><span style="color: hsl(120, 100%, 40%);">+ srvc->handle_rx = srvc_handle_rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ srvc->own_comp_id.type = ComponentType_remsimClient;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(srvc->own_comp_id.software, software);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(srvc->own_comp_id.sw_version, PACKAGE_VERSION);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = server_conn_fsm_alloc(bc, srvc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno));</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 style="color: hsl(120, 100%, 40%);">+ bankdc = &bc->bankd_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* server_host / server_port are configured from remsim-server */</span><br><span style="color: hsl(120, 100%, 40%);">+ bankdc->handle_rx = bankd_handle_rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = server_conn_fsm_alloc(bc, bankdc);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unable to connect bankd conn FSM: %s\n", strerror(errno));</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%);">+ osmo_fsm_inst_update_id(bankdc->fi, "bankd");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return bc;</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%);">+void remsim_client_set_clslot(struct bankd_client *bc, int client_id, int slot_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bc->srv_conn.clslot) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.clslot = talloc_zero(bc, ClientSlot_t);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bc->srv_conn.clslot);</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 (!bc->bankd_conn.clslot) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->bankd_conn.clslot = talloc_zero(bc, ClientSlot_t);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bc->bankd_conn.clslot);</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 (client_id >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.clslot->clientId = client_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->bankd_conn.clslot->clientId = client_id;</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 (slot_nr >= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.clslot->slotNr = slot_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->bankd_conn.clslot->slotNr = slot_nr;</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%);">+</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%);">+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> static void handle_sig_usr1(int signal)</span><br><span> {</span><br><span> OSMO_ASSERT(signal == SIGUSR1);</span><br><span>@@ -129,7 +191,7 @@</span><br><span> );</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 void handle_options(struct bankd_client *bc, int argc, char **argv)</span><br><span> {</span><br><span> while (1) {</span><br><span> int option_index = 0, c;</span><br><span>@@ -153,20 +215,16 @@</span><br><span> exit(0);</span><br><span> break;</span><br><span> case 'i':</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.server_host = optarg;</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.server_host = optarg;</span><br><span> break;</span><br><span> case 'p':</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.server_port = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ bc->srv_conn.server_port = atoi(optarg);</span><br><span> break;</span><br><span> case 'c':</span><br><span style="color: hsl(0, 100%, 40%);">- if (!g_client->srv_conn.clslot)</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.clslot->clientId = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ remsim_client_set_clslot(bc, atoi(optarg), -1);</span><br><span> break;</span><br><span> case 'n':</span><br><span style="color: hsl(0, 100%, 40%);">- if (!g_client->srv_conn.clslot)</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span style="color: hsl(0, 100%, 40%);">- g_client->srv_conn.clslot->slotNr = atoi(optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ remsim_client_set_clslot(bc, -1, atoi(optarg));</span><br><span> break;</span><br><span> default:</span><br><span> break;</span><br><span>@@ -176,8 +234,10 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct rspro_server_conn *srvc, *bankdc;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</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> </span><br><span> g_tall_ctx = talloc_named_const(NULL, 0, "global");</span><br><span> talloc_asn1_ctx = talloc_named_const(g_tall_ctx, 0, "asn1");</span><br><span>@@ -185,46 +245,15 @@</span><br><span> </span><br><span> osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- g_client = talloc_zero(g_tall_ctx, struct bankd_client);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_client = remsim_client_create(g_tall_ctx, hostname, "remsim-client");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* create and [attempt to] establish connection to remsim-server */</span><br><span style="color: hsl(0, 100%, 40%);">- srvc = &g_client->srv_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- srvc->server_host = "localhost";</span><br><span style="color: hsl(0, 100%, 40%);">- srvc->server_port = 9998;</span><br><span style="color: hsl(0, 100%, 40%);">- srvc->handle_rx = srvc_handle_rx;</span><br><span style="color: hsl(0, 100%, 40%);">- srvc->own_comp_id.type = ComponentType_remsimClient;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRLCPY_ARRAY(srvc->own_comp_id.name, "fixme-name");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRLCPY_ARRAY(srvc->own_comp_id.software, "remsim-client");</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_STRLCPY_ARRAY(srvc->own_comp_id.sw_version, PACKAGE_VERSION);</span><br><span style="color: hsl(120, 100%, 40%);">+ handle_options(g_client, argc, argv);</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%);">+ osmo_fsm_inst_dispatch(g_client->srv_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span> </span><br><span> signal(SIGUSR1, handle_sig_usr1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = server_conn_fsm_alloc(g_client, srvc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to create Server conn FSM: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(srvc->fi, SRVC_E_ESTABLISH, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> asn_debug = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bankdc = &g_client->bankd_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- if (srvc->clslot) {</span><br><span style="color: hsl(0, 100%, 40%);">- bankdc->clslot = talloc_zero(g_client, ClientSlot_t);</span><br><span style="color: hsl(0, 100%, 40%);">- *bankdc->clslot = *srvc->clslot;</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%);">- /* server_host / server_port are configured from remsim-server */</span><br><span style="color: hsl(0, 100%, 40%);">- bankdc->handle_rx = bankd_handle_rx;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(&bankdc->own_comp_id, &srvc->own_comp_id, sizeof(bankdc->own_comp_id));</span><br><span style="color: hsl(0, 100%, 40%);">- rc = server_conn_fsm_alloc(g_client, bankdc);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Unable to connect bankd conn FSM: %s\n", strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- exit(1);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_update_id(bankdc->fi, "bankd");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> client_user_main(g_client);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17158">change 17158</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/+/17158"/><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: I6456317c3968551cd69ba379c746e4dd9690d02d </div>
<div style="display:none"> Gerrit-Change-Number: 17158 </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>