<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/25410">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">client: request card-remove and sim-local when no bankd/slot is set<br><br>When the client leaves the OPERATIONAL state, do the inverse of what<br>happens when entering that state:<br>* request "card insert" no longer to be generated towards modem<br>* request switch back to local SIM<br>* reset the modem to notice the change<br><br>This way entering remote-sim operation due to adding a slotmap<br>and leaving remote-sim due to removing the slotmap should be<br>symmetrical.<br><br>Change-Id: Ifaa4b60474bf8585bfbe0288062f581821bd3faa<br>Closes: OS#5216<br>---<br>M src/client/client.h<br>M src/client/main_fsm.c<br>M src/client/user_ifdhandler.c<br>M src/client/user_shell.c<br>M src/client/user_simtrace2.c<br>5 files changed, 54 insertions(+), 2 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/10/25410/1</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 0024f52..9cfdc5d 100644</span><br><span>--- a/src/client/client.h</span><br><span>+++ b/src/client/client.h</span><br><span>@@ -43,7 +43,9 @@</span><br><span> </span><br><span> /* API from generic core to frontend (modem/cardem) */</span><br><span> int frontend_request_card_insert(struct bankd_client *bc);</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_card_remove(struct bankd_client *bc);</span><br><span> int frontend_request_sim_remote(struct bankd_client *bc);</span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_sim_local(struct bankd_client *bc);</span><br><span> int frontend_request_modem_reset(struct bankd_client *bc);</span><br><span> int frontend_handle_card2modem(struct bankd_client *bc, const uint8_t *data, size_t len);</span><br><span> int frontend_handle_set_atr(struct bankd_client *bc, const uint8_t *data, size_t len);</span><br><span>diff --git a/src/client/main_fsm.c b/src/client/main_fsm.c</span><br><span>index 673b19e..4ca07e6 100644</span><br><span>--- a/src/client/main_fsm.c</span><br><span>+++ b/src/client/main_fsm.c</span><br><span>@@ -208,6 +208,23 @@</span><br><span> call_script(bc, "request-modem-reset");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void main_st_operational_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bankd_client *bc = (struct bankd_client *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Simulate a card-remval to modem */</span><br><span style="color: hsl(120, 100%, 40%);">+ frontend_request_card_remove(bc);</span><br><span style="color: hsl(120, 100%, 40%);">+ call_script(bc, "request-card-remove");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Select local SIM */</span><br><span style="color: hsl(120, 100%, 40%);">+ frontend_request_sim_local(bc);</span><br><span style="color: hsl(120, 100%, 40%);">+ call_script(bc, "request-sim-local");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reset the modem */</span><br><span style="color: hsl(120, 100%, 40%);">+ frontend_request_modem_reset(bc);</span><br><span style="color: hsl(120, 100%, 40%);">+ call_script(bc, "request-modem-reset");</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void main_st_operational(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span> struct bankd_client *bc = (struct bankd_client *) fi->priv;</span><br><span>@@ -232,9 +249,9 @@</span><br><span> bc->bankd_conn.server_port = pdu_rx->msg.choice.configClientBankReq.bankd.port;</span><br><span> rspro2bank_slot(&bc->bankd_slot, &pdu_rx->msg.choice.configClientBankReq.bankSlot);</span><br><span> /* bankd port 0 is a magic value to indicate "no bankd" */</span><br><span style="color: hsl(0, 100%, 40%);">- if (bc->bankd_conn.server_port == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bc->bankd_conn.server_port == 0) {</span><br><span> osmo_fsm_inst_state_chg(fi, MF_ST_UNCONFIGURED, 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span> osmo_fsm_inst_state_chg(fi, MF_ST_WAIT_BANKD, 0, 0);</span><br><span> /* TODO: do we need to disconnect before? */</span><br><span> osmo_fsm_inst_dispatch(bc->bankd_conn.fi, SRVC_E_ESTABLISH, NULL);</span><br><span>@@ -353,6 +370,7 @@</span><br><span> .out_state_mask = S(MF_ST_INIT) | S(MF_ST_UNCONFIGURED) | S(MF_ST_WAIT_BANKD),</span><br><span> .action = main_st_operational,</span><br><span> .onenter = main_st_operational_onenter,</span><br><span style="color: hsl(120, 100%, 40%);">+ .onleave = main_st_operational_onleave,</span><br><span> },</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c</span><br><span>index a690503..a416e6e 100644</span><br><span>--- a/src/client/user_ifdhandler.c</span><br><span>+++ b/src/client/user_ifdhandler.c</span><br><span>@@ -156,11 +156,21 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_card_remove(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_sim_remote(struct bankd_client *bc)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_sim_local(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_modem_reset(struct bankd_client *bc)</span><br><span> {</span><br><span> return 0;</span><br><span>diff --git a/src/client/user_shell.c b/src/client/user_shell.c</span><br><span>index b22ee9a..5d37e97 100644</span><br><span>--- a/src/client/user_shell.c</span><br><span>+++ b/src/client/user_shell.c</span><br><span>@@ -20,11 +20,21 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_card_remove(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_sim_remote(struct bankd_client *bc)</span><br><span> {</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_sim_local(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_modem_reset(struct bankd_client *bc)</span><br><span> {</span><br><span> return 0;</span><br><span>diff --git a/src/client/user_simtrace2.c b/src/client/user_simtrace2.c</span><br><span>index fa6c319..8d8a6c9 100644</span><br><span>--- a/src/client/user_simtrace2.c</span><br><span>+++ b/src/client/user_simtrace2.c</span><br><span>@@ -322,12 +322,24 @@</span><br><span> return osmo_st2_cardem_request_card_insert(ci, true);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_card_remove(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_cardem_inst *ci = bc->cardem;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_cardem_request_card_insert(ci, false);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_sim_remote(struct bankd_client *bc)</span><br><span> {</span><br><span> struct osmo_st2_cardem_inst *ci = bc->cardem;</span><br><span> return osmo_st2_modem_sim_select_remote(ci->slot);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int frontend_request_sim_local(struct bankd_client *bc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_st2_cardem_inst *ci = bc->cardem;</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_st2_modem_sim_select_local(ci->slot);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int frontend_request_modem_reset(struct bankd_client *bc)</span><br><span> {</span><br><span> struct osmo_st2_cardem_inst *ci = bc->cardem;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/25410">change 25410</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/+/25410"/><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: Ifaa4b60474bf8585bfbe0288062f581821bd3faa </div>
<div style="display:none"> Gerrit-Change-Number: 25410 </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>