[PATCH v4 0/3] GATT: Change the way GATT Plugins are enabled/disabled

[PATCH v4 0/3] GATT: Change the way GATT Plugins are enabled/disabled

[chen.ganir]

From: Chen Ganir <chen.ganir@ti.com>

This patch set is a result of the discussion on the #bluez channel.

Consolidate the --enable_<profile> for gatt profiles into a single
switch, called --enable_gatt.

In addition, modify the AttributeServer property in the main.conf to
EnableGatt option (default=false) and make sure all GATT plugins query 
this option before trying to load (in the _init function of the 
plugin)

This is v4 of the patch set - fixed as suggested on the mailing list.

Chen Ganir (3):
  GATT: Remove individual config switches
  GATT: Rename Attribute Server switch
  GATT: Profile support for EnableGatt

 Makefile.am            |   38 ++++++++++----------------------------
 Makefile.tools         |    8 +++++---
 acinclude.m4           |   32 ++++----------------------------
 alert/main.c           |    9 +++++----
 bootstrap-configure    |    6 +-----
 plugins/gatt-example.c |    6 +++---
 proximity/main.c       |   10 +++++++++-
 proximity/reporter.c   |    7 ++++---
 src/adapter.c          |    8 ++++----
 src/hcid.h             |    2 +-
 src/main.c             |    4 ++--
 src/main.conf          |    5 ++---
 thermometer/main.c     |   11 +++++++++++
 time/main.c            |    9 +++++----
 14 files changed, 66 insertions(+), 89 deletions(-)

-- 
1.7.4.1

[PATCH v4 1/3] GATT: Remove individual config switches

[chen.ganir]

From: Chen Ganir <chen.ganir@ti.com>

Remove individual GATT plugin configuration switches and add a
new master gatt switch called --enable-gatt to enable/disable all 
GATT related plugins at once.
---
 Makefile.am         |   38 ++++++++++----------------------------
 Makefile.tools      |    8 +++++---
 acinclude.m4        |   32 ++++----------------------------
 bootstrap-configure |    6 +-----
 4 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bd587eb..ddc28d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,36 +199,11 @@ builtin_sources += network/main.c \
 			network/connection.h network/connection.c
 endif
 
-if PROXIMITYPLUGIN
-builtin_modules += proximity
-builtin_sources += proximity/main.c \
-			proximity/manager.h proximity/manager.c \
-			proximity/monitor.h proximity/monitor.c \
-			proximity/reporter.h proximity/reporter.c
-endif
-
 if SERVICEPLUGIN
 builtin_modules += service
 builtin_sources += plugins/service.c
 endif
 
-if GATT_EXAMPLE_PLUGIN
-builtin_modules += gatt_example
-builtin_sources += plugins/gatt-example.c
-endif
-
-if TIMEPLUGIN
-builtin_modules += time
-builtin_sources += time/main.c \
-		   time/server.h time/server.c
-endif
-
-if ALERTPLUGIN
-builtin_modules += alert
-builtin_sources += alert/main.c \
-		   alert/server.h alert/server.c
-endif
-
 if HEALTHPLUGIN
 builtin_modules += health
 builtin_sources += health/hdp_main.c health/hdp_types.h \
@@ -237,13 +212,20 @@ builtin_sources += health/hdp_main.c health/hdp_types.h \
 			health/hdp_util.h health/hdp_util.c
 endif
 
-if THERMOMETERPLUGIN
-builtin_modules += thermometer
+if GATTMODULES
+builtin_modules += thermometer alert time gatt_example proximity
 builtin_sources += thermometer/main.c \
 			thermometer/manager.h thermometer/manager.c \
-			thermometer/thermometer.h thermometer/thermometer.c
+			thermometer/thermometer.h thermometer/thermometer.c \
+			alert/main.c alert/server.h alert/server.c \
+			time/main.c time/server.h time/server.c \
+            plugins/gatt-example.c \
+            proximity/main.c proximity/manager.h proximity/manager.c \
+			proximity/monitor.h proximity/monitor.c \
+			proximity/reporter.h proximity/reporter.c
 endif
 
+
 builtin_modules += hciops mgmtops
 builtin_sources += plugins/hciops.c plugins/mgmtops.c
 
diff --git a/Makefile.tools b/Makefile.tools
index f997a3f..7b7a43f 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -218,12 +218,14 @@ EXTRA_DIST += test/apitest test/sap-client test/hsplay test/hsmicro \
 		test/test-device test/test-service test/test-serial \
 		test/test-telephony test/test-network test/simple-agent \
 		test/simple-service test/simple-endpoint test/test-audio \
-		test/test-input test/test-attrib test/test-proximity \
-		test/test-sap-server test/test-oob test/test-serial-proxy \
-		test/test-thermometer test/test-health test/test-health-sink \
+		test/test-input test/test-sap-server test/test-oob \
+		test/test-serial-proxy test/test-health test/test-health-sink \
 		test/service-record.dtd test/service-did.xml \
 		test/service-spp.xml test/service-opp.xml test/service-ftp.xml
 
+if GATTMODULES
+EXTRA_DIST += test/test-attrib test/test-proximity test/test-thermometer
+endif
 
 if HIDD
 bin_PROGRAMS += compat/hidd
diff --git a/acinclude.m4 b/acinclude.m4
index b0f790c..429e466 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -196,13 +196,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	serial_enable=yes
 	network_enable=yes
 	sap_enable=no
-	proximity_enable=no
-	time_enable=no
-	alert_enable=no
 	service_enable=yes
 	health_enable=no
 	pnat_enable=no
-	gatt_example_enable=no
 	tools_enable=yes
 	hidd_enable=no
 	pand_enable=no
@@ -219,7 +215,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	sap_driver=dummy
 	dbusoob_enable=no
 	wiimote_enable=no
-	thermometer_enable=no
+	gatt_enable=no
 
 	AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], [disable code optimization]), [
 		optimization_enable=${enableval}
@@ -246,18 +242,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	])
 	AC_SUBST([SAP_DRIVER], [sap-${sap_driver}.c])
 
-	AC_ARG_ENABLE(proximity, AC_HELP_STRING([--enable-proximity], [enable proximity plugin]), [
-		proximity_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(time, AC_HELP_STRING([--enable-time], [enable Time Profile plugin]), [
-		time_enable=${enableval}
-	])
-
-	AC_ARG_ENABLE(alert, AC_HELP_STRING([--enable-alert], [enable Phone Alert Profile plugin]), [
-		alert_enable=${enableval}
-	])
-
 	AC_ARG_ENABLE(serial, AC_HELP_STRING([--disable-serial], [disable serial plugin]), [
 		serial_enable=${enableval}
 	])
@@ -282,10 +266,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		pnat_enable=${enableval}
 	])
 
-	AC_ARG_ENABLE(gatt-example, AC_HELP_STRING([--enable-gatt-example], [enable GATT example plugin]), [
-		gatt_example_enable=${enableval}
-	])
-
 	AC_ARG_ENABLE(gstreamer, AC_HELP_STRING([--enable-gstreamer], [enable GStreamer support]), [
 		gstreamer_enable=${enableval}
 	])
@@ -368,8 +348,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 		hal_enable=${enableval}
 	])
 
-	AC_ARG_ENABLE(thermometer, AC_HELP_STRING([--enable-thermometer], [enable thermometer plugin]), [
-		thermometer_enable=${enableval}
+	AC_ARG_ENABLE(gatt, AC_HELP_STRING([--enable-gatt], [enable gatt module]), [
+		gatt_enable=${enableval}
 	])
 
 	if (test "${fortify_enable}" = "yes"); then
@@ -404,15 +384,11 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	AM_CONDITIONAL(SERIALPLUGIN, test "${serial_enable}" = "yes")
 	AM_CONDITIONAL(NETWORKPLUGIN, test "${network_enable}" = "yes")
 	AM_CONDITIONAL(SAPPLUGIN, test "${sap_enable}" = "yes")
-	AM_CONDITIONAL(PROXIMITYPLUGIN, test "${proximity_enable}" = "yes")
-	AM_CONDITIONAL(TIMEPLUGIN, test "${time_enable}" = "yes")
-	AM_CONDITIONAL(ALERTPLUGIN, test "${alert_enable}" = "yes")
 	AM_CONDITIONAL(SERVICEPLUGIN, test "${service_enable}" = "yes")
 	AM_CONDITIONAL(HEALTHPLUGIN, test "${health_enable}" = "yes")
 	AM_CONDITIONAL(MCAP, test "${health_enable}" = "yes")
 	AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes")
 	AM_CONDITIONAL(READLINE, test "${readline_found}" = "yes")
-	AM_CONDITIONAL(GATT_EXAMPLE_PLUGIN, test "${gatt_example_enable}" = "yes")
 	AM_CONDITIONAL(PNATPLUGIN, test "${pnat_enable}" = "yes")
 	AM_CONDITIONAL(HIDD, test "${hidd_enable}" = "yes")
 	AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes")
@@ -428,5 +404,5 @@ AC_DEFUN([AC_ARG_BLUEZ], [
 	AM_CONDITIONAL(MAEMO6PLUGIN, test "${maemo6_enable}" = "yes")
 	AM_CONDITIONAL(DBUSOOBPLUGIN, test "${dbusoob_enable}" = "yes")
 	AM_CONDITIONAL(WIIMOTEPLUGIN, test "${wiimote_enable}" = "yes")
-	AM_CONDITIONAL(THERMOMETERPLUGIN, test "${thermometer_enable}" = "yes")
+	AM_CONDITIONAL(GATTMODULES, test "${gatt_enable}" = "yes")
 ])
diff --git a/bootstrap-configure b/bootstrap-configure
index c38045b..e5f9daa 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -17,10 +17,6 @@ fi
 		--localstatedir=/var \
 		--libexecdir=/lib \
 		--enable-capng \
-		--enable-gatt-example \
-		--enable-proximity \
-		--enable-time \
-		--enable-alert \
 		--enable-health \
 		--enable-tools \
 		--enable-bccmd \
@@ -35,7 +31,7 @@ fi
 		--enable-maemo6 \
 		--enable-pnat \
 		--enable-sap \
-		--enable-thermometer \
 		--enable-wiimote \
 		--disable-pcmcia \
+		--enable-gatt \
 		--disable-datafiles $*
-- 
1.7.4.1

[PATCH v4 2/3] GATT: Rename AttributeServer switch

[chen.ganir]

From: Chen Ganir <chen.ganir@ti.com>

Rename the AttributeServer main.conf option to EnableGatt and
change its purpose to enable/disable all GATT related activity.
---
 alert/main.c           |    4 ++--
 plugins/gatt-example.c |    4 ++--
 proximity/reporter.c   |    2 +-
 src/adapter.c          |    8 ++++----
 src/hcid.h             |    2 +-
 src/main.c             |    4 ++--
 time/main.c            |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/alert/main.c b/alert/main.c
index 25100e9..6e2e058 100644
--- a/alert/main.c
+++ b/alert/main.c
@@ -36,7 +36,7 @@
 
 static int alert_init(void)
 {
-	if (!main_opts.attrib_server) {
+	if (!main_opts.gatt_enabled) {
 		DBG("Attribute server is disabled");
 		return -1;
 	}
@@ -46,7 +46,7 @@ static int alert_init(void)
 
 static void alert_exit(void)
 {
-	if (!main_opts.attrib_server)
+	if (!main_opts.gatt_enabled)
 		return;
 
 	alert_server_exit();
diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index f026761..165d218 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -560,7 +560,7 @@ static struct btd_adapter_driver gatt_example_adapter_driver = {
 
 static int gatt_example_init(void)
 {
-	if (!main_opts.attrib_server) {
+	if (!main_opts.gatt_enabled) {
 		DBG("Attribute server is disabled");
 		return -ENOTSUP;
 	}
@@ -570,7 +570,7 @@ static int gatt_example_init(void)
 
 static void gatt_example_exit(void)
 {
-	if (!main_opts.attrib_server)
+	if (!main_opts.gatt_enabled)
 		return;
 
 	btd_unregister_adapter_driver(&gatt_example_adapter_driver);
diff --git a/proximity/reporter.c b/proximity/reporter.c
index 9777574..d4a4c96 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -172,7 +172,7 @@ static void register_immediate_alert(struct btd_adapter *adapter)
 
 int reporter_init(struct btd_adapter *adapter)
 {
-	if (!main_opts.attrib_server) {
+	if (!main_opts.gatt_enabled) {
 		DBG("Attribute server is disabled");
 		return -1;
 	}
diff --git a/src/adapter.c b/src/adapter.c
index acb845e..13f3683 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -698,7 +698,7 @@ void btd_adapter_class_changed(struct btd_adapter *adapter, uint32_t new_class)
 
 	adapter->dev_class = new_class;
 
-	if (main_opts.attrib_server) {
+	if (main_opts.gatt_enabled) {
 		/* Removes service class */
 		class[1] = class[1] & 0x1f;
 		attrib_gap_set(adapter, GATT_CHARAC_APPEARANCE, class, 2);
@@ -722,7 +722,7 @@ void adapter_name_changed(struct btd_adapter *adapter, const char *name)
 					ADAPTER_INTERFACE, "Name",
 					DBUS_TYPE_STRING, &name);
 
-	if (main_opts.attrib_server)
+	if (main_opts.gatt_enabled)
 		attrib_gap_set(adapter, GATT_CHARAC_DEVICE_NAME,
 				(const uint8_t *) name, strlen(name));
 }
@@ -2407,7 +2407,7 @@ gboolean adapter_init(struct btd_adapter *adapter, gboolean up)
 
 	sdp_init_services_list(&adapter->bdaddr);
 
-	if (main_opts.attrib_server)
+	if (main_opts.gatt_enabled)
 		btd_adapter_gatt_server_start(adapter);
 
 	load_drivers(adapter);
@@ -2469,7 +2469,7 @@ void adapter_remove(struct btd_adapter *adapter)
 	g_slist_free(adapter->devices);
 
 	unload_drivers(adapter);
-	if (main_opts.attrib_server)
+	if (main_opts.gatt_enabled)
 		btd_adapter_gatt_server_stop(adapter);
 
 	g_slist_free(adapter->pin_callbacks);
diff --git a/src/hcid.h b/src/hcid.h
index 1987b7d..16a8ded 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -38,7 +38,7 @@ struct main_opts {
 	gboolean	reverse_sdp;
 	gboolean	name_resolv;
 	gboolean	debug_keys;
-	gboolean	attrib_server;
+	gboolean	gatt_enabled;
 
 	uint8_t		mode;
 	uint8_t		discov_interval;
diff --git a/src/main.c b/src/main.c
index 74ec3fa..a3e8c84 100644
--- a/src/main.c
+++ b/src/main.c
@@ -223,11 +223,11 @@ static void parse_config(GKeyFile *config)
 		main_opts.debug_keys = boolean;
 
 	boolean = g_key_file_get_boolean(config, "General",
-						"AttributeServer", &err);
+						"EnableGatt", &err);
 	if (err)
 		g_clear_error(&err);
 	else
-		main_opts.attrib_server = boolean;
+		main_opts.gatt_enabled = boolean;
 
 	main_opts.link_mode = HCI_LM_ACCEPT;
 
diff --git a/time/main.c b/time/main.c
index a4de0fe..cbcdb0d 100644
--- a/time/main.c
+++ b/time/main.c
@@ -36,7 +36,7 @@
 
 static int time_init(void)
 {
-	if (!main_opts.attrib_server) {
+	if (!main_opts.gatt_enabled) {
 		DBG("Attribute server is disabled");
 		return -1;
 	}
@@ -46,7 +46,7 @@ static int time_init(void)
 
 static void time_exit(void)
 {
-	if (!main_opts.attrib_server)
+	if (!main_opts.gatt_enabled)
 		return;
 
 	time_server_exit();
-- 
1.7.4.1

[PATCH v4 3/3] GATT: Profile support for EnableGatt

[chen.ganir]

From: Chen Ganir <chen.ganir@ti.com>

Add support for the EnableGatt for all GATT profiles.
---
 alert/main.c           |    5 +++--
 plugins/gatt-example.c |    2 +-
 proximity/main.c       |   10 +++++++++-
 proximity/reporter.c   |    5 +++--
 src/main.conf          |    5 ++---
 thermometer/main.c     |   11 +++++++++++
 time/main.c            |    5 +++--
 7 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/alert/main.c b/alert/main.c
index 6e2e058..ec4ab6d 100644
--- a/alert/main.c
+++ b/alert/main.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <glib.h>
+#include <errno.h>
 
 #include "plugin.h"
 #include "hcid.h"
@@ -37,8 +38,8 @@
 static int alert_init(void)
 {
 	if (!main_opts.gatt_enabled) {
-		DBG("Attribute server is disabled");
-		return -1;
+		DBG("GATT is disabled");
+		return -ENOTSUP;
 	}
 
 	return alert_server_init();
diff --git a/plugins/gatt-example.c b/plugins/gatt-example.c
index 165d218..58b222c 100644
--- a/plugins/gatt-example.c
+++ b/plugins/gatt-example.c
@@ -561,7 +561,7 @@ static struct btd_adapter_driver gatt_example_adapter_driver = {
 static int gatt_example_init(void)
 {
 	if (!main_opts.gatt_enabled) {
-		DBG("Attribute server is disabled");
+		DBG("GATT is disabled");
 		return -ENOTSUP;
 	}
 
diff --git a/proximity/main.c b/proximity/main.c
index 5f0fc12..3d5d9b2 100644
--- a/proximity/main.c
+++ b/proximity/main.c
@@ -27,13 +27,14 @@
 #endif
 
 #include <errno.h>
-
+#include <stdint.h>
 #include <glib.h>
 #include <gdbus.h>
 
 #include "log.h"
 #include "plugin.h"
 #include "manager.h"
+#include "hcid.h"
 
 static DBusConnection *connection = NULL;
 static GKeyFile *config = NULL;
@@ -59,6 +60,10 @@ static GKeyFile *open_config_file(const char *file)
 
 static int proximity_init(void)
 {
+	if (!main_opts.gatt_enabled) {
+		DBG("GATT is disabled");
+		return -ENOTSUP;
+	}
 
 	connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
 	if (connection == NULL)
@@ -76,6 +81,9 @@ static int proximity_init(void)
 
 static void proximity_exit(void)
 {
+	if (!main_opts.gatt_enabled)
+		return;
+
 	if (config)
 		g_key_file_free(config);
 
diff --git a/proximity/reporter.c b/proximity/reporter.c
index d4a4c96..74e6297 100644
--- a/proximity/reporter.c
+++ b/proximity/reporter.c
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <bluetooth/uuid.h>
 #include <adapter.h>
+#include <errno.h>
 
 #include "log.h"
 
@@ -173,8 +174,8 @@ static void register_immediate_alert(struct btd_adapter *adapter)
 int reporter_init(struct btd_adapter *adapter)
 {
 	if (!main_opts.gatt_enabled) {
-		DBG("Attribute server is disabled");
-		return -1;
+		DBG("GATT is disabled");
+		return -ENOTSUP;
 	}
 
 	DBG("Proximity Reporter for adapter %p", adapter);
diff --git a/src/main.conf b/src/main.conf
index 321f622..469c077 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -62,6 +62,5 @@ NameResolving = true
 # that they were created for.
 DebugKeys = false
 
-# Enable the GATT Attribute Server. Default is false, because it is only
-# useful for testing.
-AttributeServer = false
+# Enable the GATT functionality. Default is false
+EnableGatt = false
diff --git a/thermometer/main.c b/thermometer/main.c
index 471764e..4447b52 100644
--- a/thermometer/main.c
+++ b/thermometer/main.c
@@ -24,17 +24,25 @@
 #include <config.h>
 #endif
 
+#include <stdint.h>
 #include <glib.h>
 #include <errno.h>
 #include <gdbus.h>
 
 #include "plugin.h"
 #include "manager.h"
+#include "hcid.h"
+#include "log.h"
 
 static DBusConnection *connection = NULL;
 
 static int thermometer_init(void)
 {
+	if (!main_opts.gatt_enabled) {
+		DBG("GATT is disabled");
+		return -ENOTSUP;
+	}
+
 	connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
 	if (connection == NULL)
 		return -EIO;
@@ -49,6 +57,9 @@ static int thermometer_init(void)
 
 static void thermometer_exit(void)
 {
+	if (!main_opts.gatt_enabled)
+		return;
+
 	thermometer_manager_exit();
 
 	dbus_connection_unref(connection);
diff --git a/time/main.c b/time/main.c
index cbcdb0d..d876725 100644
--- a/time/main.c
+++ b/time/main.c
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include <glib.h>
+#include <errno.h>
 
 #include "plugin.h"
 #include "hcid.h"
@@ -37,8 +38,8 @@
 static int time_init(void)
 {
 	if (!main_opts.gatt_enabled) {
-		DBG("Attribute server is disabled");
-		return -1;
+		DBG("GATT is disabled");
+		return -ENOTSUP;
 	}
 
 	return time_server_init();
-- 
1.7.4.1

Re: [PATCH v4 3/3] GATT: Profile support for EnableGatt

[Johan Hedberg]

Hi Chen,

On Mon, Mar 19, 2012, chen.ganir@ti.com wrote:
> --- a/alert/main.c
> +++ b/alert/main.c
> @@ -28,6 +28,7 @@
>  
>  #include <stdint.h>
>  #include <glib.h>
> +#include <errno.h>
>  
>  #include "plugin.h"
>  #include "hcid.h"
> @@ -37,8 +38,8 @@
>  static int alert_init(void)
>  {
>  	if (!main_opts.gatt_enabled) {
> -		DBG("Attribute server is disabled");
> -		return -1;
> +		DBG("GATT is disabled");
> +		return -ENOTSUP;
>  	}

I've applied all three patches, but I think it'd be cleaner to have the
check for main_opts.gatt_enabled in a single central place instead of
each plugin having to do it by themselves (in general any access to
main_opts from plugins should imo be avoided).

The first idea that comes to mind is that gatt_service_add() should be
the one checking for this conf-option and plugins should check for
failure of that function.

Johan

RE: [PATCH v4 3/3] GATT: Profile support for EnableGatt

[Ganir, Chen]

Johan,

I'll check for a way to cleanly do that, and send patches.

Thanks,
Chen Ganir


> -----Original Message-----
> From: Johan Hedberg [mailto:johan.hedberg@gmail.com]
> Sent: Monday, March 26, 2012 11:21 AM
> To: Ganir, Chen
> Cc: linux-bluetooth@vger.kernel.org
> Subject: Re: [PATCH v4 3/3] GATT: Profile support for EnableGatt
> 
> Hi Chen,
> 
> On Mon, Mar 19, 2012, chen.ganir@ti.com wrote:
> > --- a/alert/main.c
> > +++ b/alert/main.c
> > @@ -28,6 +28,7 @@
> >
> >  #include <stdint.h>
> >  #include <glib.h>
> > +#include <errno.h>
> >
> >  #include "plugin.h"
> >  #include "hcid.h"
> > @@ -37,8 +38,8 @@
> >  static int alert_init(void)
> >  {
> >  	if (!main_opts.gatt_enabled) {
> > -		DBG("Attribute server is disabled");
> > -		return -1;
> > +		DBG("GATT is disabled");
> > +		return -ENOTSUP;
> >  	}
> 
> I've applied all three patches, but I think it'd be cleaner to have the
> check for main_opts.gatt_enabled in a single central place instead of
> each plugin having to do it by themselves (in general any access to
> main_opts from plugins should imo be avoided).
> 
> The first idea that comes to mind is that gatt_service_add() should be
> the one checking for this conf-option and plugins should check for
> failure of that function.
> 
> Johan