<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9926">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sniffer: also send malformed message over USB<br><br>Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a<br>---<br>M firmware/libcommon/source/sniffer.c<br>1 file changed, 15 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/9926/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libcommon/source/sniffer.c b/firmware/libcommon/source/sniffer.c</span><br><span>index 9e7341b..79d825f 100644</span><br><span>--- a/firmware/libcommon/source/sniffer.c</span><br><span>+++ b/firmware/libcommon/source/sniffer.c</span><br><span>@@ -412,8 +412,11 @@</span><br><span> atr_state = ATR_S_WAIT_T0; /* wait for format byte */</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- atr_i--; /* revert last byte */</span><br><span> TRACE_WARNING("Invalid TS received\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_send_atr(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */</span><br><span style="color: hsl(120, 100%, 40%);">+ change_state(ISO7816_S_WAIT_ATR); /* reset state */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> }</span><br><span> i = 0; /* first interface byte sub-group is coming (T0 is kind of TD0) */</span><br><span> break;</span><br><span>@@ -559,6 +562,8 @@</span><br><span> pps_state = PPS_S_WAIT_PPS0; /* go to next state */</span><br><span> } else {</span><br><span> TRACE_INFO("Invalid PPSS received\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_send_pps(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> }</span><br><span> break;</span><br><span>@@ -670,6 +675,8 @@</span><br><span> case TPDU_S_CLA:</span><br><span> if (0xff == byte) {</span><br><span> TRACE_WARNING("0xff is not a valid class byte\n\r");</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> return;</span><br><span> }</span><br><span>@@ -680,6 +687,8 @@</span><br><span> case TPDU_S_INS:</span><br><span> if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {</span><br><span> TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> return;</span><br><span> }</span><br><span>@@ -718,6 +727,8 @@</span><br><span> tpdu_state = TPDU_S_SW2;</span><br><span> } else {</span><br><span> TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send ATR to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU state */</span><br><span> return;</span><br><span> }</span><br><span>@@ -1005,15 +1016,18 @@</span><br><span> /* Use timeout to detect interrupted data transmission */</span><br><span> switch (iso_state) {</span><br><span> case ISO7816_S_IN_ATR:</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span> usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete ATR to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_ATR);</span><br><span> break;</span><br><span> case ISO7816_S_IN_TPDU:</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span> usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU);</span><br><span> break;</span><br><span> case ISO7816_S_IN_PPS_REQ:</span><br><span> case ISO7816_S_IN_PPS_RSP:</span><br><span style="color: hsl(120, 100%, 40%);">+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to user */</span><br><span> usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete TPDU to host software using USB */</span><br><span> change_state(ISO7816_S_WAIT_TPDU);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9926">change 9926</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/9926"/><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: I124c8db1d2f836e185630bbe8b5e52eb085d702a </div>
<div style="display:none"> Gerrit-Change-Number: 9926 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>