Merge branch 'master' into vas
This commit is contained in:
131 files changed
+2930
-6103
No files matched your search
@@ -33,6 +33,7 @@
|
||||
#include "pm3_cmd.h"
|
||||
#include "pmflash.h" // rdv40validation_t
|
||||
#include "cmdflashmem.h" // get_signature..
|
||||
#include "uart/uart.h" // configure timeout
|
||||
|
||||
static int CmdHelp(const char *Cmd);
|
||||
|
||||
@@ -924,6 +925,46 @@ static int CmdTia(const char *Cmd) {
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int CmdTimeout(const char *Cmd) {
|
||||
|
||||
CLIParserContext *ctx;
|
||||
CLIParserInit(&ctx, "hw timeout",
|
||||
"Set the communication timeout on the client side",
|
||||
"hw timeout --> Show current timeout\n"
|
||||
"hw timeout -t 20 --> Set the timeout to 20ms\n"
|
||||
"hw timeout -t 500 --> Set the timeout to 500ms\n"
|
||||
);
|
||||
|
||||
void *argtable[] = {
|
||||
arg_param_begin,
|
||||
arg_int0("t", "timeout", "<dec>", "timeout in ms"),
|
||||
arg_param_end
|
||||
};
|
||||
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||
int32_t arg = arg_get_int_def(ctx, 1, -1);
|
||||
CLIParserFree(ctx);
|
||||
|
||||
uint32_t oldTimeout = uart_get_timeouts();
|
||||
|
||||
// timeout is not given/invalid, just show the current timeout then return
|
||||
if (arg < 0) {
|
||||
PrintAndLogEx(INFO, "Current communication timeout: %ums", oldTimeout);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
uint32_t newTimeout = arg;
|
||||
// UART_USB_CLIENT_RX_TIMEOUT_MS is considered as the minimum required timeout.
|
||||
if (newTimeout < UART_USB_CLIENT_RX_TIMEOUT_MS) {
|
||||
PrintAndLogEx(WARNING, "Timeout less than %ums might cause errors.", UART_USB_CLIENT_RX_TIMEOUT_MS);
|
||||
} else if (newTimeout > 5000) {
|
||||
PrintAndLogEx(WARNING, "Timeout greater than 5000ms makes the client unresponsive.");
|
||||
}
|
||||
uart_reconfigure_timeouts(newTimeout);
|
||||
PrintAndLogEx(INFO, "Old communication timeout: %ums", oldTimeout);
|
||||
PrintAndLogEx(INFO, "New communication timeout: %ums", newTimeout);
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
static int CmdPing(const char *Cmd) {
|
||||
CLIParserContext *ctx;
|
||||
CLIParserInit(&ctx, "hw ping",
|
||||
@@ -1062,6 +1103,7 @@ static command_t CommandTable[] = {
|
||||
{"status", CmdStatus, IfPm3Present, "Show runtime status information about the connected Proxmark3"},
|
||||
{"tearoff", CmdTearoff, IfPm3Present, "Program a tearoff hook for the next command supporting tearoff"},
|
||||
{"tia", CmdTia, IfPm3Present, "Trigger a Timing Interval Acquisition to re-adjust the RealTimeCounter divider"},
|
||||
{"timeout", CmdTimeout, AlwaysAvailable, "Set the communication timeout on the client side"},
|
||||
{"tune", CmdTune, IfPm3Present, "Measure antenna tuning"},
|
||||
{"version", CmdVersion, AlwaysAvailable, "Show version information about the client and the connected Proxmark3, if any"},
|
||||
{NULL, NULL, NULL, NULL}
|
||||
|
||||
+13
-5
@@ -910,11 +910,19 @@ static uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *tr
|
||||
uint8_t crcc = iso14443A_CRC_check(hdr->isResponse, mfData, mfDataLen);
|
||||
|
||||
//iceman: colorise crc bytes here will need a refactor of code from above.
|
||||
PrintAndLogEx(NORMAL, " | | * |%-*s | %-4s| %s",
|
||||
str_padder,
|
||||
sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
|
||||
(crcc == 0 ? _RED_(" !! ") : (crcc == 1 ? _GREEN_(" ok ") : " ")),
|
||||
explanation);
|
||||
if (hdr->isResponse) {
|
||||
PrintAndLogEx(NORMAL, " | | * |%-*s | %-4s| %s",
|
||||
str_padder,
|
||||
sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
|
||||
(crcc == 0 ? _RED_(" !! ") : (crcc == 1 ? _GREEN_(" ok ") : " ")),
|
||||
explanation);
|
||||
} else {
|
||||
PrintAndLogEx(NORMAL, " | | * |" _YELLOW_("%-*s")" | " _YELLOW_("%s") "| " _YELLOW_("%s"),
|
||||
str_padder,
|
||||
sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
|
||||
(crcc == 0 ? _RED_(" !! ") : (crcc == 1 ? _GREEN_(" ok ") : " ")),
|
||||
explanation);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-2
@@ -623,6 +623,7 @@ int TestProxmark(pm3_device_t *dev) {
|
||||
|
||||
PacketResponseNG resp;
|
||||
uint16_t len = 32;
|
||||
bool is_tcp_conn = false;
|
||||
uint8_t data[len];
|
||||
for (uint16_t i = 0; i < len; i++)
|
||||
data[i] = i & 0xFF;
|
||||
@@ -665,16 +666,17 @@ int TestProxmark(pm3_device_t *dev) {
|
||||
memcpy(&g_pm3_capabilities, resp.data.asBytes, MIN(sizeof(capabilities_t), resp.length));
|
||||
g_conn.send_via_fpc_usart = g_pm3_capabilities.via_fpc;
|
||||
g_conn.uart_speed = g_pm3_capabilities.baudrate;
|
||||
is_tcp_conn = memcmp(g_conn.serial_port_name, "tcp:", 4) == 0;
|
||||
|
||||
PrintAndLogEx(INFO, "Communicating with PM3 over %s%s%s",
|
||||
g_conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"),
|
||||
memcmp(g_conn.serial_port_name, "tcp:", 4) == 0 ? " over " _YELLOW_("TCP") : "",
|
||||
is_tcp_conn ? " over " _YELLOW_("TCP") : "",
|
||||
memcmp(g_conn.serial_port_name, "bt:", 3) == 0 ? " over " _YELLOW_("BT") : "");
|
||||
|
||||
if (g_conn.send_via_fpc_usart) {
|
||||
PrintAndLogEx(INFO, "PM3 UART serial baudrate: " _YELLOW_("%u") "\n", g_conn.uart_speed);
|
||||
} else {
|
||||
int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
|
||||
int res = uart_reconfigure_timeouts(is_tcp_conn ? UART_TCP_CLIENT_RX_TIMEOUT_MS : UART_USB_CLIENT_RX_TIMEOUT_MS);
|
||||
if (res != PM3_SUCCESS) {
|
||||
return res;
|
||||
}
|
||||
|
||||
+762
-762
File diff suppressed because it is too large.
Load diff
@@ -74,8 +74,12 @@ bool uart_set_speed(serial_port sp, const uint32_t uiPortSpeed);
|
||||
*/
|
||||
uint32_t uart_get_speed(const serial_port sp);
|
||||
|
||||
/* Reconfigure timeouts
|
||||
/* Reconfigure timeouts (ms)
|
||||
*/
|
||||
int uart_reconfigure_timeouts(uint32_t value);
|
||||
#endif // _UART_H_
|
||||
|
||||
/* Get timeouts (ms)
|
||||
*/
|
||||
uint32_t uart_get_timeouts(void);
|
||||
|
||||
#endif // _UART_H_
|
||||
@@ -69,6 +69,10 @@ int uart_reconfigure_timeouts(uint32_t value) {
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
uint32_t uart_get_timeouts(void) {
|
||||
return newtimeout_value;
|
||||
}
|
||||
|
||||
serial_port uart_open(const char *pcPortName, uint32_t speed) {
|
||||
serial_port_unix_t_t *sp = calloc(sizeof(serial_port_unix_t_t), sizeof(uint8_t));
|
||||
|
||||
|
||||
@@ -54,6 +54,10 @@ int uart_reconfigure_timeouts(uint32_t value) {
|
||||
return PM3_SUCCESS;
|
||||
}
|
||||
|
||||
uint32_t uart_get_timeouts(void) {
|
||||
return newtimeout_value;
|
||||
}
|
||||
|
||||
static int uart_reconfigure_timeouts_polling(serial_port sp) {
|
||||
if (newtimeout_pending == false)
|
||||
return PM3_SUCCESS;
|
||||
|
||||
Reference in new issue
Block a user