<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11247">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">layer23/common: move SIM APDU caching from l1ctl.c<br><br>L1CTL implementation (i.e. l1ctl.c) is not a good place for the<br>SIM specific stuff. Let's move it to the proper place (i.e. sim.c).<br><br>As a bonus, this change fixes a possible problem of loosing the<br>cached APDUs if two or more L2&3 applications are using a single<br>LAPDm connection. The APDU buffer is dedicated per MS now.<br><br>Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566<br>---<br>M src/host/layer23/include/osmocom/bb/common/sim.h<br>M src/host/layer23/src/common/l1ctl.c<br>M src/host/layer23/src/common/sim.c<br>3 files changed, 29 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/47/11247/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/host/layer23/include/osmocom/bb/common/sim.h b/src/host/layer23/include/osmocom/bb/common/sim.h</span><br><span>index 95d2147..8b1f830 100644</span><br><span>--- a/src/host/layer23/include/osmocom/bb/common/sim.h</span><br><span>+++ b/src/host/layer23/include/osmocom/bb/common/sim.h</span><br><span>@@ -176,6 +176,10 @@</span><br><span> uint8_t reset;</span><br><span> uint8_t chv1_remain, chv2_remain;</span><br><span> uint8_t unblk1_remain, unblk2_remain;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* APDU cache (used by GSMTAP) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t apdu_data[256 + 7];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t apdu_len;</span><br><span> };</span><br><span> </span><br><span> struct sim_hdr {</span><br><span>diff --git a/src/host/layer23/src/common/l1ctl.c b/src/host/layer23/src/common/l1ctl.c</span><br><span>index 8a45ebe..e78f8be 100644</span><br><span>--- a/src/host/layer23/src/common/l1ctl.c</span><br><span>+++ b/src/host/layer23/src/common/l1ctl.c</span><br><span>@@ -50,9 +50,6 @@</span><br><span> </span><br><span> extern struct gsmtap_inst *gsmtap_inst;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int apdu_len = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t apdu_data[256 + 7];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct msgb *osmo_l1_alloc(uint8_t msg_type)</span><br><span> {</span><br><span> struct l1ctl_hdr *l1h;</span><br><span>@@ -583,12 +580,6 @@</span><br><span> struct msgb *msg;</span><br><span> uint8_t *dat;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (length <= sizeof(apdu_data)) {</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(apdu_data, data, length);</span><br><span style="color: hsl(0, 100%, 40%);">- apdu_len = length;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- apdu_len = -1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> msg = osmo_l1_alloc(L1CTL_SIM_REQ);</span><br><span> if (!msg)</span><br><span> return -1;</span><br><span>@@ -605,13 +596,6 @@</span><br><span> uint16_t len = msgb_l2len(msg);</span><br><span> uint8_t *data = msg->data;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (apdu_len > -1 && apdu_len + len <= sizeof(apdu_data)) {</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(apdu_data + apdu_len, data, len);</span><br><span style="color: hsl(0, 100%, 40%);">- apdu_len += len;</span><br><span style="color: hsl(0, 100%, 40%);">- gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM, 0, 0, 0, 0, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">- 0, apdu_data, apdu_len);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> LOGP(DL1C, LOGL_INFO, "SIM %s\n", osmo_hexdump(data, len));</span><br><span> </span><br><span> sim_apdu_resp(ms, msg);</span><br><span>diff --git a/src/host/layer23/src/common/sim.c b/src/host/layer23/src/common/sim.c</span><br><span>index c2d6033..7f5240d 100644</span><br><span>--- a/src/host/layer23/src/common/sim.c</span><br><span>+++ b/src/host/layer23/src/common/sim.c</span><br><span>@@ -24,11 +24,15 @@</span><br><span> #include <arpa/inet.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/gsmtap_util.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/gsmtap.h></span><br><span> </span><br><span> #include <osmocom/bb/common/logging.h></span><br><span> #include <osmocom/bb/common/osmocom_data.h></span><br><span> #include <osmocom/bb/common/l1ctl.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+extern struct gsmtap_inst *gsmtap_inst;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int sim_process_job(struct osmocom_ms *ms);</span><br><span> </span><br><span> /*</span><br><span>@@ -185,6 +189,16 @@</span><br><span> LOGP(DSIM, LOGL_INFO, "sending APDU (class 0x%02x, ins 0x%02x)\n",</span><br><span> data[0], data[1]);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Cache this APDU, so it can be sent to GSMTAP on response */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (length <= sizeof(ms->sim.apdu_data)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(ms->sim.apdu_data, data, length);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->sim.apdu_len = length;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIM, LOGL_NOTICE, "Cannot cache SIM APDU "</span><br><span style="color: hsl(120, 100%, 40%);">+ "(len=%u), so it won't be sent to GSMTAP\n", length);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->sim.apdu_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* adding SAP client support</span><br><span> * it makes more sense to do it here then in L1CTL */</span><br><span> if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) {</span><br><span>@@ -861,6 +875,17 @@</span><br><span> struct gsm1111_response_mfdf_gsm *mfdf_gsm;</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* If there is cached APDU */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ms->sim.apdu_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* ... and APDU buffer has enough space, send it to GSMTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((ms->sim.apdu_len + length) <= sizeof(ms->sim.apdu_data)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(ms->sim.apdu_data + ms->sim.apdu_len, data, length);</span><br><span style="color: hsl(120, 100%, 40%);">+ ms->sim.apdu_len += length;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmtap_send_ex(gsmtap_inst, GSMTAP_TYPE_SIM,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, 0, 0, 0, 0, 0, 0, ms->sim.apdu_data, ms->sim.apdu_len);</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%);">+</span><br><span> /* ignore, if current job already gone */</span><br><span> if (!sim->job_msg) {</span><br><span> LOGP(DSIM, LOGL_ERROR, "received APDU but no job, "</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11247">change 11247</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/11247"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I564c610e45aa3b630ca5d1ec6bc1cace0dc9c566 </div>
<div style="display:none"> Gerrit-Change-Number: 11247 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>