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

drivers/arygon: reject too heavy payload (ARYGON does not support extended frame even with PN532 equipped device)

Browse source
This commit is contained in:
Romuald Conty 2011-04-14 15:50:04 +00:00
parent fe49ccd701
commit 4996d36f5f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libnfc/drivers/arygon.c
View file

@ -195,7 +195,7 @@ arygon_disconnect (nfc_device_t * pnd)
nfc_device_free (pnd); nfc_device_free (pnd);
} }
#define ARYGON_TX_BUFFER_LEN (PN53x_EXTENDED_FRAME__DATA_MAX_LEN + PN53x_EXTENDED_FRAME__OVERHEAD + 1) #define ARYGON_TX_BUFFER_LEN (PN53x_NORMAL_FRAME__DATA_MAX_LEN + PN53x_NORMAL_FRAME__OVERHEAD + 1)
#define ARYGON_RX_BUFFER_LEN (PN53x_EXTENDED_FRAME__DATA_MAX_LEN + PN53x_EXTENDED_FRAME__OVERHEAD) #define ARYGON_RX_BUFFER_LEN (PN53x_EXTENDED_FRAME__DATA_MAX_LEN + PN53x_EXTENDED_FRAME__OVERHEAD)
bool bool
arygon_tama_send (nfc_device_t * pnd, const byte_t * pbtData, const size_t szData) arygon_tama_send (nfc_device_t * pnd, const byte_t * pbtData, const size_t szData)
@ -204,7 +204,16 @@ arygon_tama_send (nfc_device_t * pnd, const byte_t * pbtData, const size_t szDat
CHIP_DATA (pnd)->ui8LastCommand = pbtData[0]; CHIP_DATA (pnd)->ui8LastCommand = pbtData[0];
size_t szFrame = 0; size_t szFrame = 0;
pn53x_build_frame (abtFrame + 1, &szFrame, pbtData, szData); if (szData > PN53x_NORMAL_FRAME__DATA_MAX_LEN) {
// ARYGON Reader with PN532 equipped does not support extended frame (bug in ARYGON firmware?)
pnd->iLastError = DEINVAL;
return false;
}
if (!pn53x_build_frame (abtFrame + 1, &szFrame, pbtData, szData)) {
pnd->iLastError = DEINVAL;
return false;
}
int res = uart_send (DRIVER_DATA (pnd)->port, abtFrame, szFrame + 1); int res = uart_send (DRIVER_DATA (pnd)->port, abtFrame, szFrame + 1);
if (res != 0) { if (res != 0) {