depau/mfoc-always-skip-probes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

try to disconnect() the device on error.

Browse source
This commit is contained in:
Romuald Conty 2011-04-08 15:19:39 +00:00
parent a978ac16a9
commit 001049599f
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/mfoc.c
View file

@ -167,26 +167,26 @@ int main(int argc, char * const argv[]) {
if (!nfc_initiator_init (r.pdi)) { if (!nfc_initiator_init (r.pdi)) {
nfc_perror (r.pdi, "nfc_initiator_init"); nfc_perror (r.pdi, "nfc_initiator_init");
exit (EXIT_FAILURE); goto error;
} }
// Drop the field for a while, so can be reset // Drop the field for a while, so can be reset
if (!nfc_configure(r.pdi, NDO_ACTIVATE_FIELD, true)) { if (!nfc_configure(r.pdi, NDO_ACTIVATE_FIELD, true)) {
nfc_perror (r.pdi, "nfc_configure activate field"); nfc_perror (r.pdi, "nfc_configure activate field");
exit (EXIT_FAILURE); goto error;
} }
// Let the reader only try once to find a tag // Let the reader only try once to find a tag
if (!nfc_configure(r.pdi, NDO_INFINITE_SELECT, false)) { if (!nfc_configure(r.pdi, NDO_INFINITE_SELECT, false)) {
nfc_perror (r.pdi, "nfc_configure infinite select"); nfc_perror (r.pdi, "nfc_configure infinite select");
exit (EXIT_FAILURE); goto error;
} }
// Configure the CRC and Parity settings // Configure the CRC and Parity settings
if (!nfc_configure(r.pdi, NDO_HANDLE_CRC, true)) { if (!nfc_configure(r.pdi, NDO_HANDLE_CRC, true)) {
nfc_perror (r.pdi, "nfc_configure crc"); nfc_perror (r.pdi, "nfc_configure crc");
exit (EXIT_FAILURE); goto error;
} }
if (!nfc_configure(r.pdi, NDO_HANDLE_PARITY, true)) { if (!nfc_configure(r.pdi, NDO_HANDLE_PARITY, true)) {
nfc_perror (r.pdi, "nfc_configure parity"); nfc_perror (r.pdi, "nfc_configure parity");
exit (EXIT_FAILURE); goto error;
} }
/* /*
@ -197,7 +197,7 @@ int main(int argc, char * const argv[]) {
// mf_select_tag(r.pdi, &(t.nt)); // mf_select_tag(r.pdi, &(t.nt));
if (!nfc_initiator_select_passive_target (r.pdi, nm, NULL, 0, &t.nt)) { if (!nfc_initiator_select_passive_target (r.pdi, nm, NULL, 0, &t.nt)) {
nfc_perror (r.pdi, "nfc_initiator_select_passive_target"); nfc_perror (r.pdi, "nfc_initiator_select_passive_target");
exit (EXIT_FAILURE); goto error;
} }
// Save tag uid and info about block size (b4K) // Save tag uid and info about block size (b4K)
@ -210,15 +210,15 @@ int main(int argc, char * const argv[]) {
t.sectors = (void *) calloc(t.num_sectors, sizeof(sector)); t.sectors = (void *) calloc(t.num_sectors, sizeof(sector));
if (t.sectors == NULL) { if (t.sectors == NULL) {
ERR ("Cannot allocate memory for t.sectors"); ERR ("Cannot allocate memory for t.sectors");
exit (EXIT_FAILURE); goto error;
} }
if ((pk = (void *) malloc(sizeof(pKeys))) == NULL) { if ((pk = (void *) malloc(sizeof(pKeys))) == NULL) {
ERR ("Cannot allocate memory for pk"); ERR ("Cannot allocate memory for pk");
exit (EXIT_FAILURE); goto error;
} }
if ((bk = (void *) malloc(sizeof(bKeys))) == NULL) { if ((bk = (void *) malloc(sizeof(bKeys))) == NULL) {
ERR ("Cannot allocate memory for bk"); ERR ("Cannot allocate memory for bk");
exit (EXIT_FAILURE); goto error;
} else { } else {
bk->brokenKeys = NULL; bk->brokenKeys = NULL;
bk->size = 0; bk->size = 0;
@ -227,14 +227,13 @@ int main(int argc, char * const argv[]) {
d.distances = (void *) calloc(d.num_distances, sizeof(u_int32_t)); d.distances = (void *) calloc(d.num_distances, sizeof(u_int32_t));
if (d.distances == NULL) { if (d.distances == NULL) {
ERR ("Cannot allocate memory for t.distances"); ERR ("Cannot allocate memory for t.distances");
exit (EXIT_FAILURE); goto error;
} }
// Test if a compatible MIFARE tag is used // Test if a compatible MIFARE tag is used
if ((t.nt.nti.nai.btSak & 0x08) == 0) { if ((t.nt.nti.nai.btSak & 0x08) == 0) {
ERR ("inserted tag is not a MIFARE Classic"); ERR ("inserted tag is not a MIFARE Classic");
nfc_disconnect(r.pdi); goto error;
exit (EXIT_FAILURE);
} }
// Initialize t.sectors, keys are not known yet // Initialize t.sectors, keys are not known yet
@ -501,7 +500,10 @@ int main(int argc, char * const argv[]) {
// Disconnect device and exit // Disconnect device and exit
nfc_disconnect(r.pdi); nfc_disconnect(r.pdi);
return 0; exit (EXIT_SUCCESS);
error:
nfc_disconnect(r.pdi);
exit (EXIT_FAILURE);
} }
void usage(FILE * stream, int errno) { void usage(FILE * stream, int errno) {