<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17185">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: Make ConfigClientBankReq with bankd_port == 0 trigger SRVC_E_DISCONNECT<br><br>If the server sends us ConfigClientBankReq with bankd_port == 0, then<br>this means that we shall disconnect from the bankd. Translate this to<br>the SRVC_E_DISCONNECT event towards the RSPRO connection FSM.<br><br>Change-Id: Idbfbfa0e84fa14dcb913b4dcbd943bc80ec175ac<br>Related: OS#4399<br>---<br>M src/client/remsim_client.c<br>M src/client/simtrace2-remsim_client.c<br>2 files changed, 12 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/85/17185/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/remsim_client.c b/src/client/remsim_client.c</span><br><span>index 07ffbde..dd78c8e 100644</span><br><span>--- a/src/client/remsim_client.c</span><br><span>+++ b/src/client/remsim_client.c</span><br><span>@@ -83,8 +83,11 @@</span><br><span> rspro_IpAddr2str(&pdu->msg.choice.configClientBankReq.bankd.ip));</span><br><span> rspro2bank_slot(&bc->bankd_slot, &pdu->msg.choice.configClientBankReq.bankSlot);</span><br><span> bc->bankd_conn.server_port = pdu->msg.choice.configClientBankReq.bankd.port;</span><br><span style="color: hsl(0, 100%, 40%);">- /* instruct bankd FSM to connect */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(bc->bankd_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bankd port 0 is a magic value to indicate "no bankd" */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bc->bankd_conn.server_port == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bc->bankd_conn.fi, SRVC_E_DISCONNECT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bc->bankd_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span> /* send response to server */</span><br><span> resp = rspro_gen_ConfigClientBankRes(ResultCode_ok);</span><br><span> server_conn_send_rspro(srvc, resp);</span><br><span>diff --git a/src/client/simtrace2-remsim_client.c b/src/client/simtrace2-remsim_client.c</span><br><span>index bee8fc9..2929574 100644</span><br><span>--- a/src/client/simtrace2-remsim_client.c</span><br><span>+++ b/src/client/simtrace2-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> * (C) 2018 by sysmocom - s.f.m.c. GmbH, Author: Kevin Redon</span><br><span> *</span><br><span> * All Rights Reserved</span><br><span>@@ -874,8 +874,11 @@</span><br><span> rspro_IpAddr2str(&pdu->msg.choice.configClientBankReq.bankd.ip));</span><br><span> rspro2bank_slot(&g_client->bankd_slot, &pdu->msg.choice.configClientBankReq.bankSlot);</span><br><span> g_client->bankd_conn.server_port = pdu->msg.choice.configClientBankReq.bankd.port;</span><br><span style="color: hsl(0, 100%, 40%);">- /* instruct bankd FSM to connect */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(g_client->bankd_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* bankd port 0 is a magic value to indicate "no bankd" */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_client->bankd_conn.server_port == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(g_client->bankd_conn.fi, SRVC_E_DISCONNECT, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(g_client->bankd_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span> /* send response to server */</span><br><span> resp = rspro_gen_ConfigClientBankRes(ResultCode_ok);</span><br><span> server_conn_send_rspro(srvc, resp);</span><br><span>@@ -901,7 +904,7 @@</span><br><span> static void print_welcome(void)</span><br><span> {</span><br><span> printf("simtrace2-remsim-client - Remote SIM card client for SIMtrace\n"</span><br><span style="color: hsl(0, 100%, 40%);">- "(C) 2010-2019, Harald Welte <laforge@gnumonks.org>\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "(C) 2010-2020, Harald Welte <laforge@gnumonks.org>\n"</span><br><span> "(C) 2018, sysmocom -s.f.m.c. GmbH, Author: Kevin Redon <kredon@sysmocom.de>\n\n");</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17185">change 17185</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/+/17185"/><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: Idbfbfa0e84fa14dcb913b4dcbd943bc80ec175ac </div>
<div style="display:none"> Gerrit-Change-Number: 17185 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>