<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/18478">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">user_shell: Dispatch all events via main_fsm.c<br><br>... avoid calling server_conn_send_rspro() directly from user code.<br><br>Change-Id: I7f589ea1b1610e6d716ed0d9f4078b185bc6401d<br>---<br>M src/client/user_shell.c<br>1 file changed, 20 insertions(+), 10 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/78/18478/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/client/user_shell.c b/src/client/user_shell.c</span><br><span>index 9c804c6..c8f1b5f 100644</span><br><span>--- a/src/client/user_shell.c</span><br><span>+++ b/src/client/user_shell.c</span><br><span>@@ -74,21 +74,30 @@</span><br><span> static void handle_stdin_command(struct stdin_state *ss, char *cmd)</span><br><span> {</span><br><span> struct bankd_client *bc = ss->bc;</span><br><span style="color: hsl(0, 100%, 40%);">- RsproPDU_t *pdu;</span><br><span style="color: hsl(0, 100%, 40%);">- BankSlot_t bslot;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf[1024];</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bank_slot2rspro(&bslot, &bc->bankd_slot);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OSMO_ASSERT(ss->rx_msg);</span><br><span> </span><br><span> if (!strcasecmp(cmd, "RESET")) {</span><br><span> /* reset the [remote] card */</span><br><span style="color: hsl(0, 100%, 40%);">- pdu = rspro_gen_ClientSlotStatusInd(bc->srv_conn.clslot, &bslot,</span><br><span style="color: hsl(0, 100%, 40%);">- true, false, false, true);</span><br><span style="color: hsl(0, 100%, 40%);">- server_conn_send_rspro(&bc->bankd_conn, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct frontend_phys_status pstatus = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .flags = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .reset_active = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ .vcc_present = false,</span><br><span style="color: hsl(120, 100%, 40%);">+ .clk_active = false,</span><br><span style="color: hsl(120, 100%, 40%);">+ .card_present = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ .voltage_mv = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .fi = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .di = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .wi = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .waiting_time = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bc->main_fi, MF_E_MDM_STATUS_IND, &pstatus);</span><br><span> } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct frontend_tpdu ftpdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf[1024];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* we assume the user has entered a C-APDU as hex string. parse + send */</span><br><span> rc = osmo_hexparse(cmd, buf, sizeof(buf));</span><br><span> if (rc < 0) {</span><br><span>@@ -101,8 +110,9 @@</span><br><span> }</span><br><span> </span><br><span> /* Send CMD APDU to [remote] card */</span><br><span style="color: hsl(0, 100%, 40%);">- pdu = rspro_gen_TpduModem2Card(bc->srv_conn.clslot, &bslot, buf, rc);</span><br><span style="color: hsl(0, 100%, 40%);">- server_conn_send_rspro(&bc->bankd_conn, pdu);</span><br><span style="color: hsl(120, 100%, 40%);">+ ftpdu.buf = buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ ftpdu.len = rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(bc->main_fi, MF_E_MDM_TPDU, &ftpdu);</span><br><span> }</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/+/18478">change 18478</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/+/18478"/><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: I7f589ea1b1610e6d716ed0d9f4078b185bc6401d </div>
<div style="display:none"> Gerrit-Change-Number: 18478 </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>