Return-Path: Date: Wed, 16 Oct 2013 15:24:27 +0300 From: Andrei Emeltchenko To: Szymon Janc Cc: linux-bluetooth@vger.kernel.org Subject: Re: [PATCHv2 3/6] android: Add basic mgmt initialization sequence Message-ID: <20131016122425.GM2861@aemeltch-MOBL1> References: <1381833423-862-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> <1381913215-17957-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> <1381913215-17957-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> <7351603.qM58B1tehZ@uw000953> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <7351603.qM58B1tehZ@uw000953> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Hi Szymon, On Wed, Oct 16, 2013 at 02:03:54PM +0200, Szymon Janc wrote: > Hi Andrei, > > > From: Andrei Emeltchenko > > > > Initialize bluetooth controller via mgmt interface. > > --- > > Makefile.android | 4 +- > > android/Android.mk | 5 ++ > > android/main.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 3 files changed, 176 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile.android b/Makefile.android > > index 3ceefd8..7371a77 100644 > > --- a/Makefile.android > > +++ b/Makefile.android > > @@ -1,7 +1,9 @@ > > if ANDROID > > noinst_PROGRAMS += android/bluetoothd > > > > -android_bluetoothd_SOURCES = android/main.c src/log.c > > +android_bluetoothd_SOURCES = android/main.c src/log.c \ > > + src/shared/util.h src/shared/util.c \ > > + src/shared/mgmt.h src/shared/mgmt.c > > android_bluetoothd_LDADD = @GLIB_LIBS@ > > endif > > > > diff --git a/android/Android.mk b/android/Android.mk > > index 0e025ac..4996080 100644 > > --- a/android/Android.mk > > +++ b/android/Android.mk > > @@ -15,10 +15,15 @@ include $(CLEAR_VARS) > > LOCAL_SRC_FILES := \ > > main.c \ > > log.c \ > > + ../src/shared/mgmt.c \ > > + ../src/shared/util.c \ > > > > LOCAL_C_INCLUDES := \ > > $(call include-path-for, glib) \ > > $(call include-path-for, glib)/glib \ > > + > > +LOCAL_C_INCLUDES += \ > > + $(LOCAL_PATH)/../ \ > > $(LOCAL_PATH)/../src \ > > > > LOCAL_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\" > > diff --git a/android/main.c b/android/main.c > > index f75b0a8..ba25b84 100644 > > --- a/android/main.c > > +++ b/android/main.c > > @@ -25,6 +25,7 @@ > > #include > > #endif > > > > +#include > > #include > > #include > > #include > > @@ -36,9 +37,17 @@ > > > > #include "log.h" > > > > +#include "lib/bluetooth.h" > > +#include "lib/mgmt.h" > > +#include "src/shared/mgmt.h" > > + > > #define SHUTDOWN_GRACE_SECONDS 10 > > > > static GMainLoop *event_loop; > > +static struct mgmt *mgmt_if = NULL; > > + > > +static uint8_t mgmt_version = 0; > > +static uint8_t mgmt_revision = 0; > > > > static gboolean quit_eventloop(gpointer user_data) > > { > > @@ -67,6 +76,161 @@ static GOptionEntry options[] = { > > { NULL } > > }; > > > > +static void read_info_complete(uint8_t status, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + /* TODO: Store Controller information */ > > + > > + /* TODO: Register all event notification handlers */ > > +} > > + > > + > > +static void mgmt_index_added_event(uint16_t index, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + DBG("index %u", index); > > + > > + if (mgmt_send(mgmt_if, MGMT_OP_READ_INFO, index, 0, NULL, > > + read_info_complete, NULL, NULL) > 0) > > + return; > > + > > + error("Failed to read adapter info for index %u", index); > > + > > +} > > + > > +static void mgmt_index_removed_event(uint16_t index, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + DBG("index %u", index); > > +} > > + > > +static void read_index_list_complete(uint8_t status, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + const struct mgmt_rp_read_index_list *rp = param; > > + uint16_t num; > > + int i; > > + > > + info(__func__); > > + > > + if (!status) { > > + error("%s: Failed to read index list: %s (0x%02x)", > > + __func__, mgmt_errstr(status), status); > > + return; > > + } > > + > > + if (length < sizeof(*rp)) { > > + error("%s: Wrong size of read index list response", __func__); > > + return; > > + } > > + > > + num = btohs(rp->num_controllers); > > + > > + DBG("%s: Number of controllers: %u", __func__, num); > > + > > + if (num * sizeof(uint16_t) + sizeof(*rp) != length) { > > + error("%s: Incorrect pkt size for index list rsp", __func__); > > + return; > > + } > > + > > + for (i = 0; i < num; i++) { > > + uint16_t index; > > + > > + index = btohs(rp->index[i]); > > + > > + /** > > + * Use index added event notification. > > + */ > > + mgmt_index_added_event(index, 0, NULL, NULL); > > + } > > +} > > + > > +static void read_commands_complete(uint8_t status, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + const struct mgmt_rp_read_commands *rp = param; > > + > > + DBG(""); > > + > > + if (!status) { > > + error("Failed to read supported commands: %s (0x%02x)", > > + mgmt_errstr(status), status); > > + return; > > + } > > This will always fail... I would use explicit comparison to MGMT status code > if (status != MGMT_STATUS_SUCCESS) { ... } Yes, sorry this was automatic style change :( I just check for status then. Best regards Andrei Emeltchenko > > > + > > + if (length < sizeof(*rp)) { > > + error("Wrong size response"); > > + return; > > + } > > +} > > + > > +static void read_version_complete(uint8_t status, uint16_t length, > > + const void *param, void *user_data) > > +{ > > + const struct mgmt_rp_read_version *rp = param; > > + > > + DBG(""); > > + > > + if (!status) { > > + error("Failed to read version information: %s (0x%02x)", > > + mgmt_errstr(status), status); > > + return; > > + } > > Ditto. > > > + > > + if (length < sizeof(*rp)) { > > + error("Wrong size response"); > > + return; > > + } > > + > > + mgmt_version = rp->version; > > + mgmt_revision = btohs(rp->revision); > > + > > + info("Bluetooth management interface %u.%u initialized", > > + mgmt_version, mgmt_revision); > > + > > + if (mgmt_version < 1) { > > + error("Version 1.0 or later of management interface required"); > > + abort(); > > + } > > + > > + mgmt_send(mgmt_if, MGMT_OP_READ_COMMANDS, MGMT_INDEX_NONE, 0, NULL, > > + read_commands_complete, NULL, NULL); > > + > > + mgmt_register(mgmt_if, MGMT_EV_INDEX_ADDED, MGMT_INDEX_NONE, > > + mgmt_index_added_event, NULL, NULL); > > + mgmt_register(mgmt_if, MGMT_EV_INDEX_REMOVED, MGMT_INDEX_NONE, > > + mgmt_index_removed_event, NULL, NULL); > > + > > + if (mgmt_send(mgmt_if, MGMT_OP_READ_INDEX_LIST, MGMT_INDEX_NONE, 0, > > + NULL, read_index_list_complete, NULL, NULL) > 0) > > + return; > > + > > + error("Failed to read controller index list"); > > +} > > + > > +static bool init_mgmt_interface(void) > > +{ > > + mgmt_if = mgmt_new_default(); > > + if (!mgmt_if) { > > + error("Failed to access management interface"); > > + return false; > > + } > > + > > + if (mgmt_send(mgmt_if, MGMT_OP_READ_VERSION, MGMT_INDEX_NONE, 0, NULL, > > + read_version_complete, NULL, NULL) == 0) { > > + error("Error sending READ_VERSION mgmt command"); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +static void cleanup_mgmt_interface(void) > > +{ > > + mgmt_unref(mgmt_if); > > + mgmt_if = NULL; > > +} > > + > > int main(int argc, char *argv[]) > > { > > GOptionContext *context; > > @@ -100,10 +264,14 @@ int main(int argc, char *argv[]) > > sigaction(SIGINT, &sa, NULL); > > sigaction(SIGTERM, &sa, NULL); > > > > + if (!init_mgmt_interface()) > > + return EXIT_FAILURE; > > + > > DBG("Entering main loop"); > > > > g_main_loop_run(event_loop); > > > > + cleanup_mgmt_interface(); > > g_main_loop_unref(event_loop); > > > > info("Exit"); > > > > -- > BR > Szymon Janc >