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

Add timeout parameter to nfc_emulate_target() function.

Browse source 
Fixes issue 219.

Thanks to raidolinja.
This commit is contained in:
Romuald Conty 2013-01-30 00:10:24 +01:00
parent b675db73be
commit cd2b03a08a
6 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Jan TBD, 2013 - 1.7.0-rc3 (release candidate)
--------------------------------------------
Changes:
- nfc_emulate_target() now takes timeout parameter
Jan 20, 2013 - 1.7.0-rc2 (release candidate) Jan 20, 2013 - 1.7.0-rc2 (release candidate)
-------------------------------------------- --------------------------------------------

7
NEWS
View file

@ -1,3 +1,10 @@
New in 1.7.0-rc3:
API Changes:
* Functions
- Add timeout param to nfc_emulate_target()
New in 1.7.0-rc2: New in 1.7.0-rc2:
Configuration: Configuration:

2
examples/nfc-emulate-forum-tag2.c
View file

@ -197,7 +197,7 @@ main(int argc, char *argv[])
printf("NFC device: %s opened\n", nfc_device_get_name(pnd)); printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
printf("Emulating NDEF tag now, please touch it with a second NFC device\n"); printf("Emulating NDEF tag now, please touch it with a second NFC device\n");
if (nfc_emulate_target(pnd, &emulator) < 0) { if (nfc_emulate_target(pnd, &emulator, 0) < 0) {
goto error; goto error;
} }

2
include/nfc/nfc-emulation.h
View file

@ -55,7 +55,7 @@ extern "C" {
void *data; void *data;
}; };
NFC_EXPORT int nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator); NFC_EXPORT int nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator, const int timeout);
#ifdef __cplusplus #ifdef __cplusplus
} }

19
libnfc/nfc-emulation.c
View file

@ -28,14 +28,24 @@
#include "iso7816.h" #include "iso7816.h"
/** @ingroup emulation
* @brief Emulate a target
* @return Returns 0 on success, otherwise returns libnfc's error code (negative value).
*
* @param pnd \a nfc_device struct pointer that represents currently used device
* @param emulator \nfc_emulator struct point that handles input/output functions
*
* If timeout equals to 0, the function blocks indefinitely (until an error is raised or function is completed)
* If timeout equals to -1, the default timeout will be used
*/
int int
nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator) nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator, const int timeout)
{ {
uint8_t abtRx[ISO7816_SHORT_R_APDU_MAX_LEN]; uint8_t abtRx[ISO7816_SHORT_R_APDU_MAX_LEN];
uint8_t abtTx[ISO7816_SHORT_C_APDU_MAX_LEN]; uint8_t abtTx[ISO7816_SHORT_C_APDU_MAX_LEN];
int res; int res;
if ((res = nfc_target_init(pnd, emulator->target, abtRx, sizeof(abtRx), 0)) < 0) { if ((res = nfc_target_init(pnd, emulator->target, abtRx, sizeof(abtRx), timeout)) < 0) {
return res; return res;
} }
@ -44,12 +54,12 @@ nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator)
while (io_res >= 0) { while (io_res >= 0) {
io_res = emulator->state_machine->io(emulator, abtRx, szRx, abtTx, sizeof(abtTx)); io_res = emulator->state_machine->io(emulator, abtRx, szRx, abtTx, sizeof(abtTx));
if (io_res > 0) { if (io_res > 0) {
if ((res = nfc_target_send_bytes(pnd, abtTx, io_res, 0)) < 0) { if ((res = nfc_target_send_bytes(pnd, abtTx, io_res, timeout)) < 0) {
return res; return res;
} }
} }
if (io_res >= 0) { if (io_res >= 0) {
if ((res = nfc_target_receive_bytes(pnd, abtRx, sizeof(abtRx), 0)) < 0) { if ((res = nfc_target_receive_bytes(pnd, abtRx, sizeof(abtRx), timeout)) < 0) {
return res; return res;
} }
szRx = res; szRx = res;
@ -57,3 +67,4 @@ nfc_emulate_target(nfc_device *pnd, struct nfc_emulator *emulator)
} }
return (io_res < 0) ? io_res : 0; return (io_res < 0) ? io_res : 0;
} }

2
utils/nfc-emulate-forum-tag4.c
View file

@ -382,7 +382,7 @@ main(int argc, char *argv[])
printf("NFC device: %s opened\n", nfc_device_get_name(pnd)); printf("NFC device: %s opened\n", nfc_device_get_name(pnd));
printf("Emulating NDEF tag now, please touch it with a second NFC device\n"); printf("Emulating NDEF tag now, please touch it with a second NFC device\n");
if (0 != nfc_emulate_target(pnd, &emulator)) { // contains already nfc_target_init() call if (0 != nfc_emulate_target(pnd, &emulator, 0)) { // contains already nfc_target_init() call
nfc_perror(pnd, "nfc_emulate_target"); nfc_perror(pnd, "nfc_emulate_target");
} }