Diff between ec8c8f22efb66ccae533fbd55a236570ffcf756c and a1cdd683dfebafdb37b29b0155f04457bc44c7d4

Changed Files

File Additions Deletions Status
src/adapter.c +7 -0 modified
src/btd.h +1 -0 modified
src/main.c +9 -0 modified
src/main.conf +4 -0 modified

Full Patch

diff --git a/src/adapter.c b/src/adapter.c
index 2071cf8..1551011 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -10078,6 +10078,13 @@ static void index_added(uint16_t index, uint16_t length, const void *param,
 		return;
 	}
 
+	/* Check if at maximum adapters allowed in the system then ignore the
+	 * adapter.
+	 */
+	if (btd_opts.max_adapters &&
+			btd_opts.max_adapters == g_slist_length(adapters))
+		return;
+
 	reset_adv_monitors(index);
 
 	adapter = btd_adapter_new(index);
diff --git a/src/btd.h b/src/btd.h
index a805a40..d136468 100644
--- a/src/btd.h
+++ b/src/btd.h
@@ -121,6 +121,7 @@ struct btd_opts {
 	uint16_t	did_version;
 
 	bt_mode_t	mode;
+	uint16_t	max_adapters;
 	bt_gatt_cache_t gatt_cache;
 	uint16_t	gatt_mtu;
 	uint8_t		gatt_channels;
diff --git a/src/main.c b/src/main.c
index 8cc2dfc..bf9d398 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,6 +77,7 @@ static const char *supported_options[] = {
 	"NameResolving",
 	"DebugKeys",
 	"ControllerMode",
+	"MaxControllers"
 	"MultiProfile",
 	"FastConnectable",
 	"Privacy",
@@ -779,6 +780,14 @@ static void parse_config(GKeyFile *config)
 		g_free(str);
 	}
 
+	val = g_key_file_get_integer(config, "General", "MaxControllers", &err);
+	if (err) {
+		g_clear_error(&err);
+	} else {
+		DBG("MaxControllers=%d", val);
+		btd_opts.max_adapters = val;
+	}
+
 	str = g_key_file_get_string(config, "General", "MultiProfile", &err);
 	if (err) {
 		g_clear_error(&err);
diff --git a/src/main.conf b/src/main.conf
index 49b9e67..4017962 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -51,6 +51,10 @@
 # Possible values: "dual", "bredr", "le"
 #ControllerMode = dual
 
+# Maximum number of controllers allowed to be exposed to the system.
+# Default=0 (unlimited)
+#MaxControllers=0
+
 # Enables Multi Profile Specification support. This allows to specify if
 # system supports only Multiple Profiles Single Device (MPSD) configuration
 # or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple