<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10204">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniff: send ATR over GSMTAP<br><br>Change-Id: Id35129883f08002a4a796b56954a128e2b533245<br>---<br>M host/simtrace2-sniff.c<br>1 file changed, 14 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/04/10204/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/host/simtrace2-sniff.c b/host/simtrace2-sniff.c</span><br><span>index 776253a..6d5766f 100644</span><br><span>--- a/host/simtrace2-sniff.c</span><br><span>+++ b/host/simtrace2-sniff.c</span><br><span>@@ -65,7 +65,7 @@</span><br><span> /* global GSMTAP instance */</span><br><span> static struct gsmtap_inst *g_gti;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int gsmtap_send_sim(const uint8_t *apdu, unsigned int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static int gsmtap_send_sim(uint8_t sub_type, const uint8_t *data, unsigned int len)</span><br><span> {</span><br><span>        struct gsmtap_hdr *gh;</span><br><span>       unsigned int gross_len = len + sizeof(*gh);</span><br><span>@@ -80,8 +80,9 @@</span><br><span>      gh->version = GSMTAP_VERSION;</span><br><span>     gh->hdr_len = sizeof(*gh)/4;</span><br><span>      gh->type = GSMTAP_TYPE_SIM;</span><br><span style="color: hsl(120, 100%, 40%);">+        gh->sub_type = sub_type;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf + sizeof(*gh), apdu, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf + sizeof(*gh), data, len);</span><br><span> </span><br><span>    rc = write(gsmtap_inst_fd(g_gti), buf, gross_len);</span><br><span>   if (rc < 0) {</span><br><span>@@ -235,9 +236,17 @@</span><br><span>      }</span><br><span>    printf("\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (SIMTRACE_MSGT_SNIFF_TPDU == type) {</span><br><span style="color: hsl(0, 100%, 40%);">-         /* send TPDU (now considered as APDU) to GSMTAP */</span><br><span style="color: hsl(0, 100%, 40%);">-              gsmtap_send_sim(data->data, data->length);</span><br><span style="color: hsl(120, 100%, 40%);">+      /* Send message as GSNTAP */</span><br><span style="color: hsl(120, 100%, 40%);">+  switch (type) {</span><br><span style="color: hsl(120, 100%, 40%);">+       case SIMTRACE_MSGT_SNIFF_ATR:</span><br><span style="color: hsl(120, 100%, 40%);">+         gsmtap_send_sim(GSMTAP_SIM_ATR, data->data, data->length);</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case SIMTRACE_MSGT_SNIFF_TPDU:</span><br><span style="color: hsl(120, 100%, 40%);">+                /* TPDU is now considered as APDU since SIMtrace sends complete TPDU */</span><br><span style="color: hsl(120, 100%, 40%);">+               gsmtap_send_sim(GSMTAP_SIM_APDU, data->data, data->length);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span>       }</span><br><span> </span><br><span>        return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10204">change 10204</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/10204"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Id35129883f08002a4a796b56954a128e2b533245 </div>
<div style="display:none"> Gerrit-Change-Number: 10204 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>