RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

nested structs on the sender, for more lean packet size computation

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-23 20:54:21 +02:00
parent 270afb89aa
commit fda181890c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/cmdusart.c
View file

@ -169,15 +169,18 @@ static int usart_rx(uint8_t *data, size_t *len, uint32_t waittime) {
static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t *dstlen, uint32_t waittime) { static int usart_txrx(uint8_t *srcdata, size_t srclen, uint8_t *dstdata, size_t *dstlen, uint32_t waittime) {
clearCommandBuffer(); clearCommandBuffer();
struct { struct payload_header {
uint32_t waittime; uint32_t waittime;
} PACKED;
struct {
struct payload_header header;
uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)]; uint8_t data[PM3_CMD_DATA_SIZE - sizeof(uint32_t)];
} PACKED payload; } PACKED payload;
payload.waittime = waittime; payload.header.waittime = waittime;
if (srclen >= sizeof(payload.data)) if (srclen >= sizeof(payload.data))
return PM3_EOVFLOW; return PM3_EOVFLOW;
memcpy(payload.data, srcdata, srclen); memcpy(payload.data, srcdata, srclen);
SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.waittime)); SendCommandNG(CMD_USART_TXRX, (uint8_t *)&payload, srclen + sizeof(payload.header));
PacketResponseNG resp; PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, waittime + 500)) { if (!WaitForResponseTimeout(CMD_USART_TXRX, &resp, waittime + 500)) {
return PM3_ETIMEOUT; return PM3_ETIMEOUT;