diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2013-07-12 10:55:50 +0200 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-07-18 20:23:38 +0200 |
commit | e0155c890d907ac0131a215365faed74b525d0ea (patch) | |
tree | 27890af456b173f4c7fdc8a1299953d163a34a22 /src/ndef.c | |
parent | d63787dae9c3409c40b32b164d3a570562186b56 (diff) | |
download | neard-e0155c890d907ac0131a215365faed74b525d0ea.tar.gz neard-e0155c890d907ac0131a215365faed74b525d0ea.tar.bz2 neard-e0155c890d907ac0131a215365faed74b525d0ea.zip |
ndef: Make near_ndef_prepare_cfg_message accept cdr as pointer
This allows to acctually create multibye cdr if needed. Currently neard
always use one byte cdr but let us be in match with spec and a bit more
future proof.
Diffstat (limited to 'src/ndef.c')
-rw-r--r-- | src/ndef.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1685,7 +1685,7 @@ static struct near_ndef_message *near_ndef_prepare_cr_message(uint16_t cr_id) static struct near_ndef_message *near_ndef_prepare_cfg_message(char *mime_type, uint8_t *data, int data_len, - char cdr, uint8_t cdr_len) + char *cdr, uint8_t cdr_len) { struct near_ndef_message *msg = NULL; @@ -1694,7 +1694,7 @@ static struct near_ndef_message *near_ndef_prepare_cfg_message(char *mime_type, if (mime_type == NULL) return NULL; - msg = ndef_message_alloc_complete(mime_type, data_len, &cdr, cdr_len, + msg = ndef_message_alloc_complete(mime_type, data_len, cdr, cdr_len, RECORD_TNF_MIME, TRUE, TRUE); if (msg == NULL) return NULL; @@ -1786,7 +1786,8 @@ static int near_ndef_prepare_ac_and_cfg_records(enum record_type type, if (local_carrier == NULL && type == RECORD_TYPE_WKT_HANDOVER_REQUEST) { *cfg = near_ndef_prepare_cfg_message(mime_type, - NULL, 0, cdr, 1); + NULL, 0, + &cdr, sizeof(cdr)); *ac = near_ndef_prepare_ac_message(CPS_UNKNOWN, cdr); return 0; @@ -1799,7 +1800,8 @@ static int near_ndef_prepare_ac_and_cfg_records(enum record_type type, } *cfg = near_ndef_prepare_cfg_message(mime_type, local_carrier->data, - local_carrier->size, cdr, 1); + local_carrier->size, + &cdr, sizeof(cdr)); *ac = near_ndef_prepare_ac_message(local_carrier->state, cdr); g_free(local_carrier); |