--- android/hal-map-client.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/android/hal-map-client.c b/android/hal-map-client.c index 7fb3011..7538958 100644 --- a/android/hal-map-client.c +++ b/android/hal-map-client.c @@ -15,6 +15,7 @@ * */ +#include <stdlib.h> #include <stdbool.h> #include "hal-log.h" @@ -31,9 +32,55 @@ static bool interface_ready(void) /* Event Handlers */ +static void remote_mas_instances_to_hal(btmce_mas_instance_t *send_instance, + struct hal_map_client_mas_instance *instance, + uint8_t num_instances, uint16_t len) +{ + void *buf = instance; + uint8_t i; + + DBG(""); + + for (i = 0; i < num_instances; i++) { + if (sizeof(*instance) + instance->name_len > len) { + error("invalid remote mas instances (%zu > %u)," + "aborting", + sizeof(*instance) + instance->name_len, len); + exit(EXIT_FAILURE); + } + + send_instance[i].id = instance->id; + send_instance[i].msg_types = instance->msg_types; + send_instance[i].scn = instance->scn; + send_instance[i].p_name = (char *) instance->name; + + len -= sizeof(*instance) + instance->name_len; + buf += sizeof(*instance) + instance->name_len; + instance = buf; + } + + if (!len) + return; + + error("invalid remote mas instances (%u bytes left), aborting", len); + exit(EXIT_FAILURE); +} + static void handle_remote_mas_instances(void *buf, uint16_t len, int fd) { + struct hal_ev_map_client_remote_mas_instances *ev = buf; + btmce_mas_instance_t instances[ev->num_instances]; + + DBG(""); + + len -= sizeof(*ev); + remote_mas_instances_to_hal(instances, ev->instances, ev->num_instances, + len); + if (cbs->remote_mas_instances_cb) + cbs->remote_mas_instances_cb(ev->status, + (bt_bdaddr_t *) ev->bdaddr, + ev->num_instances, instances); } /* handlers will be called from notification thread context, -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html