<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16614">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bankd: Implement card reset based on clientSlotStatusInd<br><br>If a client is sending us a clientSlotStatusInd indicating that<br>the modem has switched off VCC or activated RST, bankd will<br>now issue a respective PC/SC command to perform a cold or warm<br>reset of the card.<br><br>Change-Id: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1<br>Closes: OS#4330<br>---<br>M src/bankd/bankd.h<br>M src/bankd/bankd_main.c<br>M src/bankd/bankd_pcsc.c<br>3 files changed, 59 insertions(+), 11 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/14/16614/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd.h b/src/bankd/bankd.h</span><br><span>index 7f4d687..d713ed1 100644</span><br><span>--- a/src/bankd/bankd.h</span><br><span>+++ b/src/bankd/bankd.h</span><br><span>@@ -102,6 +102,8 @@</span><br><span> struct bankd_driver_ops {</span><br><span> /* open a given card/slot: called once client + mapping exists */</span><br><span> int (*open_card)(struct bankd_worker *worker);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* reset a given card/slot with either cold or warm reset */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*reset_card)(struct bankd_worker *worker, bool cold_reset);</span><br><span> int (*transceive)(struct bankd_worker *worker, const uint8_t *out, size_t out_len,</span><br><span> uint8_t *in, size_t *in_len);</span><br><span> /* called at cleanup time of a worker thread: clear any driver related state */</span><br><span>diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>index af25ded..b3e38b3 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -727,6 +727,26 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int worker_handle_clientSlotStatusInd(struct bankd_worker *worker, const RsproPDU_t *pdu)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct ClientSlotStatusInd *cssi = &pdu->msg.choice.clientSlotStatusInd;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct SlotPhysStatus *sps = &cssi->slotPhysStatus;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "clientSlotStatusInd(RST=%s, VCC=%s, CLK=%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ sps->resetActive ? "ACTIVE" : "INACTIVE",</span><br><span style="color: hsl(120, 100%, 40%);">+ sps->vccPresent ? *sps->vccPresent ? "PRESENT" : "ABSENT" : "NULL",</span><br><span style="color: hsl(120, 100%, 40%);">+ sps->clkActive ? *sps->clkActive ? "ACTIVE" : "INACTIVE" : "NULL");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* perform cold or warm reset */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sps->vccPresent && *sps->vccPresent == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = worker->ops->reset_card(worker, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (sps->resetActive)</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = worker->ops->reset_card(worker, false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* handle one incoming RSPRO message from a client inside a worker thread */</span><br><span> static int worker_handle_rspro(struct bankd_worker *worker, const RsproPDU_t *pdu)</span><br><span> {</span><br><span>@@ -742,7 +762,7 @@</span><br><span> rc = worker_handle_tpduModemToCard(worker, pdu);</span><br><span> break;</span><br><span> case RsproPDUchoice_PR_clientSlotStatusInd:</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = worker_handle_clientSlotStatusInd(worker, pdu);</span><br><span> rc = 0;</span><br><span> break;</span><br><span> case RsproPDUchoice_PR_setAtrRes:</span><br><span>diff --git a/src/bankd/bankd_pcsc.c b/src/bankd/bankd_pcsc.c</span><br><span>index a390782..f6e3683 100644</span><br><span>--- a/src/bankd/bankd_pcsc.c</span><br><span>+++ b/src/bankd/bankd_pcsc.c</span><br><span>@@ -152,6 +152,24 @@</span><br><span> LOGW((w), ": OK\n"); \</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int pcsc_get_atr(struct bankd_worker *worker)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ long rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ char pbReader[MAX_READERNAME];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* use DWORD type as this is what the PC/SC API expects */</span><br><span style="color: hsl(120, 100%, 40%);">+ DWORD dwReaderLen = sizeof(pbReader);</span><br><span style="color: hsl(120, 100%, 40%);">+ DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr);</span><br><span style="color: hsl(120, 100%, 40%);">+ DWORD dwState, dwProt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt,</span><br><span style="color: hsl(120, 100%, 40%);">+ worker->card.atr, &dwAtrLen);</span><br><span style="color: hsl(120, 100%, 40%);">+ PCSC_ERROR(worker, rc, "SCardStatus")</span><br><span style="color: hsl(120, 100%, 40%);">+ worker->card.atr_len = dwAtrLen;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len));</span><br><span style="color: hsl(120, 100%, 40%);">+end:</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int pcsc_open_card(struct bankd_worker *worker)</span><br><span> {</span><br><span> long rc;</span><br><span>@@ -171,16 +189,23 @@</span><br><span> PCSC_ERROR(worker, rc, "SCardConnect")</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* use DWORD type as this is what the PC/SC API expects */</span><br><span style="color: hsl(0, 100%, 40%);">- char pbReader[MAX_READERNAME];</span><br><span style="color: hsl(0, 100%, 40%);">- DWORD dwReaderLen = sizeof(pbReader);</span><br><span style="color: hsl(0, 100%, 40%);">- DWORD dwAtrLen = worker->card.atr_len = sizeof(worker->card.atr);</span><br><span style="color: hsl(0, 100%, 40%);">- DWORD dwState, dwProt;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = SCardStatus(worker->reader.pcsc.hCard, pbReader, &dwReaderLen, &dwState, &dwProt,</span><br><span style="color: hsl(0, 100%, 40%);">- worker->card.atr, &dwAtrLen);</span><br><span style="color: hsl(0, 100%, 40%);">- PCSC_ERROR(worker, rc, "SCardStatus")</span><br><span style="color: hsl(0, 100%, 40%);">- worker->card.atr_len = dwAtrLen;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGW(worker, "Card ATR: %s\n", osmo_hexdump_nospc(worker->card.atr, worker->card.atr_len));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcsc_get_atr(worker);</span><br><span style="color: hsl(120, 100%, 40%);">+end:</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+static int pcsc_reset_card(struct bankd_worker *worker, bool cold_reset)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ long rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ DWORD dwActiveProtocol;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGW(worker, "Resetting card in '%s' (%s)\n", worker->reader.name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cold_reset ? "cold reset" : "warm reset");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = SCardReconnect(worker->reader.pcsc.hCard, SCARD_SHARE_SHARED, SCARD_PROTOCOL_T0,</span><br><span style="color: hsl(120, 100%, 40%);">+ cold_reset ? SCARD_UNPOWER_CARD : SCARD_RESET_CARD, &dwActiveProtocol);</span><br><span style="color: hsl(120, 100%, 40%);">+ PCSC_ERROR(worker, rc, "SCardReconnect");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = pcsc_get_atr(worker);</span><br><span> end:</span><br><span> return rc;</span><br><span> }</span><br><span>@@ -213,6 +238,7 @@</span><br><span> </span><br><span> const struct bankd_driver_ops pcsc_driver_ops = {</span><br><span> .open_card = pcsc_open_card,</span><br><span style="color: hsl(120, 100%, 40%);">+ .reset_card = pcsc_reset_card,</span><br><span> .transceive = pcsc_transceive,</span><br><span> .cleanup = pcsc_cleanup,</span><br><span> };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/16614">change 16614</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/+/16614"/><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: Ifa615d239ec3ad6daebd8e99e4f7d5b99d32c0e1 </div>
<div style="display:none"> Gerrit-Change-Number: 16614 </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>