2014-10-10 11:37:33

by Alfonso Acosta

Subject: [PATCH] core: Add Manufacturer Specific Data EIR field

Athough the Manufacturer Specific Data field is not used internally,
it's useful for external plugins, e.g. iBeacon.
---
src/eir.c | 8 ++++++++
src/eir.h | 4 ++++
2 files changed, 12 insertions(+)

diff --git a/src/eir.c b/src/eir.c
index d22ad91..f130855 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -240,6 +240,14 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len)
eir->did_product = data[4] | (data[5] << 8);
eir->did_version = data[6] | (data[7] << 8);
break;
+
+ case EIR_MANUFACTURER_DATA:
+ if (data_len < 2)
+ break;
+ eir->msd_company = get_le16(data);
+ eir->msd_data_len = data_len - 2;
+ memcpy(&eir->msd_data, data+2, eir->msd_data_len);
+ break;
}

eir_data += field_len + 1;
diff --git a/src/eir.h b/src/eir.h
index e486fa2..88a5bf0 100644
--- a/src/eir.h
+++ b/src/eir.h
@@ -37,6 +37,7 @@
#define EIR_SSP_RANDOMIZER 0x0F /* SSP Randomizer */
#define EIR_DEVICE_ID 0x10 /* device ID */
#define EIR_GAP_APPEARANCE 0x19 /* GAP appearance */
+#define EIR_MANUFACTURER_DATA 0xFF /* Manufacturer Specific Data */

/* Flags Descriptions */
#define EIR_LIM_DISC 0x01 /* LE Limited Discoverable Mode */
@@ -62,6 +63,9 @@ struct eir_data {
uint16_t did_product;
uint16_t did_version;
uint16_t did_source;
+ uint16_t msd_company;
+ uint8_t msd_data[HCI_MAX_EIR_LENGTH];
+ uint8_t msd_data_len;
};

void eir_data_free(struct eir_data *eir);
--
1.9.1

2014-10-10 15:27:31

by Alfonso Acosta

Subject: Re: [PATCH] core: Add Manufacturer Specific Data EIR field

Please ignore this first patch. I sent a new bundle "[PATCH v2 0/2] core:
Add plugin-support for Manufacturer Specific Data EIR" with more
context and an extra patch for subscribing to MSD from plugins.

On Fri, Oct 10, 2014 at 1:37 PM, Alfonso Acosta <[email protected]> wrote:
> Athough the Manufacturer Specific Data field is not used internally,
> it's useful for external plugins, e.g. iBeacon.
> ---
> src/eir.c | 8 ++++++++
> src/eir.h | 4 ++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/src/eir.c b/src/eir.c
> index d22ad91..f130855 100644
> --- a/src/eir.c
> +++ b/src/eir.c
> @@ -240,6 +240,14 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len)
> eir->did_product = data[4] | (data[5] << 8);
> eir->did_version = data[6] | (data[7] << 8);
> break;
> +
> + case EIR_MANUFACTURER_DATA:
> + if (data_len < 2)
> + break;
> + eir->msd_company = get_le16(data);
> + eir->msd_data_len = data_len - 2;
> + memcpy(&eir->msd_data, data+2, eir->msd_data_len);
> + break;
> }
>
> eir_data += field_len + 1;
> diff --git a/src/eir.h b/src/eir.h
> index e486fa2..88a5bf0 100644
> --- a/src/eir.h
> +++ b/src/eir.h
> @@ -37,6 +37,7 @@
> #define EIR_SSP_RANDOMIZER 0x0F /* SSP Randomizer */
> #define EIR_DEVICE_ID 0x10 /* device ID */
> #define EIR_GAP_APPEARANCE 0x19 /* GAP appearance */
> +#define EIR_MANUFACTURER_DATA 0xFF /* Manufacturer Specific Data */
>
> /* Flags Descriptions */
> #define EIR_LIM_DISC 0x01 /* LE Limited Discoverable Mode */
> @@ -62,6 +63,9 @@ struct eir_data {
> uint16_t did_product;
> uint16_t did_version;
> uint16_t did_source;
> + uint16_t msd_company;
> + uint8_t msd_data[HCI_MAX_EIR_LENGTH];
> + uint8_t msd_data_len;
> };
>
> void eir_data_free(struct eir_data *eir);
> --
> 1.9.1
>



--
Alfonso Acosta

Embedded Systems Engineer at Spotify
Birger Jarlsgatan 61, Stockholm, Sweden
http://www.spotify.com