<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16626">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;">remsim-client: Move client_config from .c to .h file<br><br>Change-Id: I158fe0f2791c164adc74cf851d5a139990bce852<br>---<br>M src/client/client.h<br>M src/client/simtrace2-remsim_client.c<br>2 files changed, 31 insertions(+), 27 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 f36e2e3..7cc7ec1 100644</span><br><span>--- a/src/client/client.h</span><br><span>+++ b/src/client/client.h</span><br><span>@@ -13,6 +13,35 @@</span><br><span> </span><br><span> struct cardem_inst;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define ATR_SIZE_MAX 55</span><br><span style="color: hsl(120, 100%, 40%);">+struct client_config {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *server_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ int server_port;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ int client_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ int client_slot;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ char *gsmtap_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool keep_running;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ char *event_script;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t data[ATR_SIZE_MAX];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+ } atr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ int vendor_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ int product_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ int config_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ int if_num;</span><br><span style="color: hsl(120, 100%, 40%);">+ int altsetting;</span><br><span style="color: hsl(120, 100%, 40%);">+ int addr;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *path;</span><br><span style="color: hsl(120, 100%, 40%);">+ } usb;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct bankd_client {</span><br><span> /* connection to the remsim-server (control) */</span><br><span> struct rspro_server_conn srv_conn;</span><br><span>@@ -24,5 +53,6 @@</span><br><span> </span><br><span> struct bank_slot bankd_slot;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ struct client_config *cfg;</span><br><span> struct cardem_inst *cardem;</span><br><span> };</span><br><span>diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c</span><br><span>index 190eb90..515fd50 100644</span><br><span>--- a/src/client/simtrace2-remsim_client.c</span><br><span>+++ b/src/client/simtrace2-remsim_client.c</span><br><span>@@ -844,33 +844,6 @@</span><br><span> );</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define ATR_SIZE_MAX 55</span><br><span style="color: hsl(0, 100%, 40%);">-struct client_config {</span><br><span style="color: hsl(0, 100%, 40%);">- char *server_host;</span><br><span style="color: hsl(0, 100%, 40%);">- int server_port;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- int client_id;</span><br><span style="color: hsl(0, 100%, 40%);">- int client_slot;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- char *gsmtap_host;</span><br><span style="color: hsl(0, 100%, 40%);">- bool keep_running;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t data[ATR_SIZE_MAX];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t len;</span><br><span style="color: hsl(0, 100%, 40%);">- } atr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">- int vendor_id;</span><br><span style="color: hsl(0, 100%, 40%);">- int product_id;</span><br><span style="color: hsl(0, 100%, 40%);">- int config_id;</span><br><span style="color: hsl(0, 100%, 40%);">- int if_num;</span><br><span style="color: hsl(0, 100%, 40%);">- int altsetting;</span><br><span style="color: hsl(0, 100%, 40%);">- int addr;</span><br><span style="color: hsl(0, 100%, 40%);">- char *path;</span><br><span style="color: hsl(0, 100%, 40%);">- } usb;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct client_config *client_config_init(void *ctx)</span><br><span> {</span><br><span> struct client_config *cfg = talloc_zero(ctx, struct client_config);</span><br><span>@@ -1152,6 +1125,7 @@</span><br><span> // initialize remote SIM client</span><br><span> </span><br><span> g_client = talloc_zero(g_tall_ctx, struct bankd_client);</span><br><span style="color: hsl(120, 100%, 40%);">+ g_client->cfg = cfg;</span><br><span> g_client->cardem = g_ci;</span><br><span> </span><br><span> if (cfg->client_id != -1) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16626">change 16626</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/+/16626"/><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: I158fe0f2791c164adc74cf851d5a139990bce852 </div>
<div style="display:none"> Gerrit-Change-Number: 16626 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </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>