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

Split user_data and state_machine_data.

Browse source
This commit is contained in:
Romain Tartiere 2011-03-13 14:40:36 +00:00
parent 0f0fa2b14f
commit 53960c4643
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
examples/nfc-emulate-forum-tag4.c
View file

@ -67,9 +67,12 @@ static bool quiet_output = false;
typedef enum { NONE, CC_FILE, NDEF_FILE } file; typedef enum { NONE, CC_FILE, NDEF_FILE } file;
struct nfcforum_tag4 { struct nfcforum_tag4_ndef_data {
uint8_t *ndef_file; uint8_t *ndef_file;
size_t ndef_file_len; size_t ndef_file_len;
};
struct nfcforum_tag4_state_machine_data {
file current_file; file current_file;
}; };
@ -102,7 +105,8 @@ nfcforum_tag4_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
{ {
int res = 0; int res = 0;
struct nfcforum_tag4 *data = (struct nfcforum_tag4 *)(emulator->user_data); struct nfcforum_tag4_ndef_data *ndef_data = (struct nfcforum_tag4_ndef_data *)(emulator->user_data);
struct nfcforum_tag4_state_machine_data *state_machine_data = (struct nfcforum_tag4_state_machine_data *)(emulator->state_machine->data);
// Show transmitted command // Show transmitted command
if (!quiet_output) { if (!quiet_output) {
@ -136,13 +140,13 @@ nfcforum_tag4_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
const uint8_t ndef_file[] = { 0xE1, 0x04 }; const uint8_t ndef_file[] = { 0xE1, 0x04 };
if ((data_in[LC] == sizeof (ndef_capability_container)) && (0 == memcmp (ndef_capability_container, data_in + DATA, data_in[LC]))) { if ((data_in[LC] == sizeof (ndef_capability_container)) && (0 == memcmp (ndef_capability_container, data_in + DATA, data_in[LC]))) {
memcpy (data_out, "\x90\x00", res = 2); memcpy (data_out, "\x90\x00", res = 2);
data->current_file = CC_FILE; state_machine_data->current_file = CC_FILE;
} else if ((data_in[LC] == sizeof (ndef_file)) && (0 == memcmp (ndef_file, data_in + DATA, data_in[LC]))) { } else if ((data_in[LC] == sizeof (ndef_file)) && (0 == memcmp (ndef_file, data_in + DATA, data_in[LC]))) {
memcpy (data_out, "\x90\x00", res = 2); memcpy (data_out, "\x90\x00", res = 2);
data->current_file = NDEF_FILE; state_machine_data->current_file = NDEF_FILE;
} else { } else {
memcpy (data_out, "\x6a\x00", res = 2); memcpy (data_out, "\x6a\x00", res = 2);
data->current_file = NONE; state_machine_data->current_file = NONE;
} }
break; break;
@ -167,7 +171,7 @@ nfcforum_tag4_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
if ((size_t)(data_in[LC] + 2) > data_out_len) { if ((size_t)(data_in[LC] + 2) > data_out_len) {
return -ENOSPC; return -ENOSPC;
} }
switch (data->current_file) { switch (state_machine_data->current_file) {
case NONE: case NONE:
memcpy (data_out, "\x6a\x82", res = 2); memcpy (data_out, "\x6a\x82", res = 2);
break; break;
@ -177,7 +181,7 @@ nfcforum_tag4_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
res = data_in[LC] + 2; res = data_in[LC] + 2;
break; break;
case NDEF_FILE: case NDEF_FILE:
memcpy (data_out, data->ndef_file + (data_in[P1] << 8) + data_in[P2], data_in[LC]); memcpy (data_out, ndef_data->ndef_file + (data_in[P1] << 8) + data_in[P2], data_in[LC]);
memcpy (data_out + data_in[LC], "\x90\x00", 2); memcpy (data_out + data_in[LC], "\x90\x00", 2);
res = data_in[LC] + 2; res = data_in[LC] + 2;
break; break;
@ -185,9 +189,9 @@ nfcforum_tag4_io (struct nfc_emulator *emulator, const byte_t *data_in, const si
break; break;
case ISO7816_UPDATE_BINARY: case ISO7816_UPDATE_BINARY:
memcpy (data->ndef_file + (data_in[P1] << 8) + data_in[P2], data_in + DATA, data_in[LC]); memcpy (ndef_data->ndef_file + (data_in[P1] << 8) + data_in[P2], data_in + DATA, data_in[LC]);
if ((data_in[P1] << 8) + data_in[P2] == 0) { if ((data_in[P1] << 8) + data_in[P2] == 0) {
data->ndef_file_len = (data->ndef_file[0] << 8) + data->ndef_file[1] + 2; ndef_data->ndef_file_len = (ndef_data->ndef_file[0] << 8) + ndef_data->ndef_file[1] + 2;
} }
memcpy (data_out, "\x90\x00", res = 2); memcpy (data_out, "\x90\x00", res = 2);
break; break;
@ -222,7 +226,7 @@ void stop_emulation (int sig)
} }
size_t size_t
ndef_message_load (char *filename, struct nfcforum_tag4 *tag_data) ndef_message_load (char *filename, struct nfcforum_tag4_ndef_data *tag_data)
{ {
struct stat sb; struct stat sb;
if (stat (filename, &sb) < 0) if (stat (filename, &sb) < 0)
@ -250,7 +254,7 @@ ndef_message_load (char *filename, struct nfcforum_tag4 *tag_data)
} }
size_t size_t
ndef_message_save (char *filename, struct nfcforum_tag4 *tag_data) ndef_message_save (char *filename, struct nfcforum_tag4_ndef_data *tag_data)
{ {
FILE *F; FILE *F;
if (!(F= fopen (filename, "w"))) if (!(F= fopen (filename, "w")))
@ -299,14 +303,18 @@ main (int argc, char *argv[])
0x6f, 0x72, 0x67 0x6f, 0x72, 0x67
}; };
struct nfcforum_tag4 nfcforum_tag4_data = { struct nfcforum_tag4_ndef_data nfcforum_tag4_data = {
.ndef_file = ndef_file, .ndef_file = ndef_file,
.ndef_file_len = ndef_file[1] + 2, .ndef_file_len = ndef_file[1] + 2,
};
struct nfcforum_tag4_state_machine_data state_machine_data = {
.current_file = NONE, .current_file = NONE,
}; };
struct nfc_emulation_state_machine state_machine = { struct nfc_emulation_state_machine state_machine = {
.io = nfcforum_tag4_io, .io = nfcforum_tag4_io,
.data = &state_machine_data,
}; };
struct nfc_emulator emulator = { struct nfc_emulator emulator = {

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

@ -34,7 +34,7 @@ struct nfc_emulator {
struct nfc_emulation_state_machine { struct nfc_emulation_state_machine {
int (*io)(struct nfc_emulator *emulator, const byte_t *data_in, const size_t data_in_len, byte_t *data_out, const size_t data_out_len); int (*io)(struct nfc_emulator *emulator, const byte_t *data_in, const size_t data_in_len, byte_t *data_out, const size_t data_out_len);
void *state_machine_data; void *data;
}; };
int nfc_emulate_target (nfc_device_t* pnd, struct nfc_emulator *emulator); int nfc_emulate_target (nfc_device_t* pnd, struct nfc_emulator *emulator);