Change in simtrace2[master]: sniffer: also send malformed message over USB
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9926 )
Change subject: sniffer: also send malformed message over USB
..
sniffer: also send malformed message over USB
Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a
---
M firmware/libcommon/source/sniffer.c
1 file changed, 15 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/firmware/libcommon/source/sniffer.c
b/firmware/libcommon/source/sniffer.c
index be57d54..1c691af 100644
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -412,8 +412,11 @@
atr_state = ATR_S_WAIT_T0; /* wait for format byte */
break;
default:
- atr_i--; /* revert last byte */
TRACE_WARNING("Invalid TS received\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_atr(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
+ change_state(ISO7816_S_WAIT_ATR); /* reset state */
+ break;
}
i = 0; /* first interface byte sub-group is coming (T0 is kind
of TD0) */
break;
@@ -559,6 +562,8 @@
pps_state = PPS_S_WAIT_PPS0; /* go to next state */
} else {
TRACE_INFO("Invalid PPSS received\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_pps(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
}
break;
@@ -670,6 +675,8 @@
case TPDU_S_CLA:
if (0xff == byte) {
TRACE_WARNING("0xff is not a valid class byte\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -680,6 +687,8 @@
case TPDU_S_INS:
if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -718,6 +727,8 @@
tpdu_state = TPDU_S_SW2;
} else {
TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -1005,15 +1016,18 @@
/* Use timeout to detect interrupted data transmission
*/
switch (iso_state) {
case ISO7816_S_IN_ATR:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE);
/* send incomplete ATR to host software using USB */
change_state(ISO7816_S_WAIT_ATR);
break;
case ISO7816_S_IN_TPDU:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host
software using USB */
change_state(ISO7816_S_WAIT_TPDU);
break;
case ISO7816_S_IN_PPS_REQ:
case ISO7816_S_IN_PPS_RSP:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE);
/* send incomplete TPDU to host software using USB */
change_state(ISO7816_S_WAIT_TPDU);
break;
--
To view, visit https://gerrit.osmocom.org/9926
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit
Change in simtrace2[master]: sniffer: also send malformed message over USB
Harald Welte has posted comments on this change. ( https://gerrit.osmocom.org/9926 ) Change subject: sniffer: also send malformed message over USB .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/9926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a Gerrit-Change-Number: 9926 Gerrit-PatchSet: 5 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 11 Jul 2018 19:55:29 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in simtrace2[master]: sniffer: also send malformed message over USB
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/9926 to look at the new patch set (#5). Change subject: sniffer: also send malformed message over USB .. sniffer: also send malformed message over USB Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a --- M firmware/libcommon/source/sniffer.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/9926/5 -- To view, visit https://gerrit.osmocom.org/9926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a Gerrit-Change-Number: 9926 Gerrit-PatchSet: 5 Gerrit-Owner: Kévin Redon Gerrit-Reviewer: Jenkins Builder
Change in simtrace2[master]: sniffer: also send malformed message over USB
Kévin Redon has uploaded this change for review. (
https://gerrit.osmocom.org/9926
Change subject: sniffer: also send malformed message over USB
..
sniffer: also send malformed message over USB
Change-Id: I124c8db1d2f836e185630bbe8b5e52eb085d702a
---
M firmware/libcommon/source/sniffer.c
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/9926/1
diff --git a/firmware/libcommon/source/sniffer.c
b/firmware/libcommon/source/sniffer.c
index 9e7341b..79d825f 100644
--- a/firmware/libcommon/source/sniffer.c
+++ b/firmware/libcommon/source/sniffer.c
@@ -412,8 +412,11 @@
atr_state = ATR_S_WAIT_T0; /* wait for format byte */
break;
default:
- atr_i--; /* revert last byte */
TRACE_WARNING("Invalid TS received\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_atr(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
+ change_state(ISO7816_S_WAIT_ATR); /* reset state */
+ break;
}
i = 0; /* first interface byte sub-group is coming (T0 is kind
of TD0) */
break;
@@ -559,6 +562,8 @@
pps_state = PPS_S_WAIT_PPS0; /* go to next state */
} else {
TRACE_INFO("Invalid PPSS received\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_pps(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
}
break;
@@ -670,6 +675,8 @@
case TPDU_S_CLA:
if (0xff == byte) {
TRACE_WARNING("0xff is not a valid class byte\n\r");
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -680,6 +687,8 @@
case TPDU_S_INS:
if ((0x60 == (byte & 0xf0)) || (0x90 == (byte & 0xf0))) {
TRACE_WARNING("invalid CLA 0x%02x\n\r", byte);
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -718,6 +727,8 @@
tpdu_state = TPDU_S_SW2;
} else {
TRACE_WARNING("invalid SW1 0x%02x\n\r", byte);
+ led_blink(LED_RED, BLINK_2F_O); /* indicate error to
user */
+ usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_MALFORMED); /* send
ATR to host software using USB */
change_state(ISO7816_S_WAIT_TPDU); /* go back to TPDU
state */
return;
}
@@ -1005,15 +1016,18 @@
/* Use timeout to detect interrupted data transmission
*/
switch (iso_state) {
case ISO7816_S_IN_ATR:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_atr(SNIFF_DATA_FLAG_ERROR_INCOMPLETE);
/* send incomplete ATR to host software using USB */
change_state(ISO7816_S_WAIT_ATR);
break;
case ISO7816_S_IN_TPDU:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_tpdu(SNIFF_DATA_FLAG_ERROR_INCOMPLETE); /* send incomplete PPS to host
software using USB */
change_state(ISO7816_S_WAIT_TPDU);
break;
case ISO7816_S_IN_PPS_REQ:
case ISO7816_S_IN_PPS_RSP:
+ led_blink(LED_RED, BLINK_2F_O); /* indicate
error to user */
usb_send_pps(SNIFF_DATA_FLAG_ERROR_INCOMPLETE);
/* send incomplete TPDU to host software using USB */
change_state(ISO7816_S_WAIT_TPDU);
break;
--
To view, visit https://gerrit.osmocom.org/9926
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: simtrace2
Gerrit-Branch: master
G
