github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples)

Browse source
This commit is contained in:
Philippe Teuwen 2019-04-22 02:11:46 +02:00
commit 3e402797c1
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
client/comms.c
View file

@ -50,9 +50,9 @@ static int cmd_tail = 0;
// to lock rxBuffer operations from different threads // to lock rxBuffer operations from different threads
static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t rxBufferMutex = PTHREAD_MUTEX_INITIALIZER;
// Global start time for WaitForResponseTimeout, so we can reset timeout when we get Dbprintf packets // Global start time for WaitForResponseTimeout & dl_it, so we can reset timeout when we get packets
// as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status at 9600) // as sending lot of these packets can slow down things wuite a lot on slow links (e.g. hw status or lf read at 9600)
static uint64_t WaitForResponseTimeout_start_time; static uint64_t timeout_start_time;
static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd); static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd);
@ -245,7 +245,7 @@ static void PacketResponseReceived(PacketResponseNG *packet) {
// packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd); // packet->ng ? "NG" : "OLD", packet->magic, packet->length, packet->status, packet->crc, packet->cmd);
// we got a packet, reset WaitForResponseTimeout timeout // we got a packet, reset WaitForResponseTimeout timeout
WaitForResponseTimeout_start_time = msclock(); timeout_start_time = msclock();
switch (packet->cmd) { switch (packet->cmd) {
// First check if we are handling a debug message // First check if we are handling a debug message
@ -620,29 +620,29 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
if (ms_timeout != (size_t)-1) if (ms_timeout != (size_t)-1)
ms_timeout += communication_delay(); ms_timeout += communication_delay();
WaitForResponseTimeout_start_time = msclock(); timeout_start_time = msclock();
// Wait until the command is received // Wait until the command is received
while (true) { while (true) {
while (getReply(response)) { while (getReply(response)) {
if (cmd == CMD_UNKNOWN || response->cmd == cmd) { if (cmd == CMD_UNKNOWN || response->cmd == cmd) {
// PrintAndLogEx(INFO, "Waited %i ms", msclock() - WaitForResponseTimeout_start_time); // PrintAndLogEx(INFO, "Waited %i ms", msclock() - timeout_start_time);
return true; return true;
} }
} }
if (msclock() - WaitForResponseTimeout_start_time > ms_timeout) if (msclock() - timeout_start_time > ms_timeout)
break; break;
if (msclock() - WaitForResponseTimeout_start_time > 3000 && show_warning) { if (msclock() - timeout_start_time > 3000 && show_warning) {
// 3 seconds elapsed (but this doesn't mean the timeout was exceeded) // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
PrintAndLogEx(INFO, "Waiting for a response from the proxmark3..."); PrintAndLogEx(INFO, "Waiting for a response from the proxmark3...");
PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button"); PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
show_warning = false; show_warning = false;
} }
} }
// PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - WaitForResponseTimeout_start_time); // PrintAndLogEx(INFO, "Wait timeout after %i ms", msclock() - timeout_start_time);
return false; return false;
} }
@ -704,7 +704,7 @@ bool GetFromDevice(DeviceMemType_t memtype, uint8_t *dest, uint32_t bytes, uint3
static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) { static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketResponseNG *response, size_t ms_timeout, bool show_warning, uint32_t rec_cmd) {
uint32_t bytes_completed = 0; uint32_t bytes_completed = 0;
uint64_t start_time = msclock(); timeout_start_time = msclock();
while (true) { while (true) {
@ -737,12 +737,12 @@ static bool dl_it(uint8_t *dest, uint32_t bytes, uint32_t start_index, PacketRes
} }
} }
if (msclock() - start_time > ms_timeout) { if (msclock() - timeout_start_time > ms_timeout) {
PrintAndLogEx(FAILED, "Timed out while trying to download data from device"); PrintAndLogEx(FAILED, "Timed out while trying to download data from device");
break; break;
} }
if (msclock() - start_time > 3000 && show_warning) { if (msclock() - timeout_start_time > 3000 && show_warning) {
// 3 seconds elapsed (but this doesn't mean the timeout was exceeded) // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3..."); PrintAndLogEx(NORMAL, "Waiting for a response from the Proxmark3...");
PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button"); PrintAndLogEx(NORMAL, "You can cancel this operation by pressing the pm3 button");