crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to current libnfc devel API.

Browse source 
libnfc changed its nfc_initiator_transceive_bytes(): it now takes a const size_t used as maximal allowed rx bytes.
libnfc now checks if rx buffer is large enough to get the full response, so libfreefare should take care about whole size of its buffers.
This commit is contained in:
Romuald Conty 2012-06-01 21:26:01 +00:00
parent a8e0b6e1e7
commit dd1315321d
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libfreefare/mifare_classic.c
View file

@ -89,12 +89,14 @@
do { \
errno = 0; \
DEBUG_XFER (msg, __##msg##_n, "===> "); \
if ((nfc_initiator_transceive_bytes (tag->device, msg, __##msg##_n, res, &__##res##_n, 0) < 0)) { \
int _res; \
if ((_res = nfc_initiator_transceive_bytes (tag->device, msg, __##msg##_n, res, __##res##_size, 0)) < 0) { \
if (disconnect) { \
tag->active = false; \
} \
return errno = EIO, -1; \
} \
__##res##_n = _res; \
DEBUG_XFER (res, __##res##_n, "<=== "); \
} while (0)
@ -308,7 +310,7 @@ mifare_classic_read (MifareTag tag, const MifareClassicBlockNumber block, Mifare
ASSERT_MIFARE_CLASSIC (tag);
BUFFER_INIT (cmd, 2);
BUFFER_ALIAS (res, data);
BUFFER_ALIAS (res, data, sizeof(MifareClassicBlock));
BUFFER_APPEND (cmd, MC_READ);
BUFFER_APPEND (cmd, block);