diff mbox series

[BlueZ,1/2] device: Add timer for removing temporary devices

Message ID 20200715204635.755599-1-luiz.dentz@gmail.com (mailing list archive)
State New, archived
Headers show
Series [BlueZ,1/2] device: Add timer for removing temporary devices | expand

Commit Message

Luiz Augusto von Dentz July 15, 2020, 8:46 p.m. UTC 
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds a timer for how long to keep temporary devices, it is updated
everytime the device is seen so devices will be removed even during an
active discovery session which means the discovering for a long period
will no longer just grow without removing devices that disappeared.
---
 src/device.c  | 34 ++++++++++++++++++++++++++++++++++
 src/hcid.h    |  1 +
 src/main.c    | 13 +++++++++++++
 src/main.conf |  5 +++++
 4 files changed, 53 insertions(+)

Comments

Bastien Nocera July 15, 2020, 9:03 p.m. UTC | #1 
On Wed, 2020-07-15 at 13:46 -0700, Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This adds a timer for how long to keep temporary devices, it is
> updated
> everytime the device is seen so devices will be removed even during
> an
> active discovery session which means the discovering for a long
> period
> will no longer just grow without removing devices that disappeared.

Both patches look good to me.

Cheers
Luiz Augusto von Dentz July 16, 2020, 4:40 p.m. UTC | #2 
Hi,

On Wed, Jul 15, 2020 at 2:03 PM Bastien Nocera <hadess@hadess.net> wrote:
>
> On Wed, 2020-07-15 at 13:46 -0700, Luiz Augusto von Dentz wrote:
> > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> >
> > This adds a timer for how long to keep temporary devices, it is
> > updated
> > everytime the device is seen so devices will be removed even during
> > an
> > active discovery session which means the discovering for a long
> > period
> > will no longer just grow without removing devices that disappeared.
>
> Both patches look good to me.

Pushed.
diff mbox series

Patch

diff --git a/src/device.c b/src/device.c
index 0deee2707..226216235 100644
--- a/src/device.c
+++ b/src/device.c
@@ -233,6 +233,7 @@  struct btd_device {
 	bool		connectable;
 	guint		disconn_timer;
 	guint		discov_timer;
+	guint		temporary_timer;	/* Temporary/disappear timer */
 	struct browse_req *browse;		/* service discover request */
 	struct bonding_req *bonding;
 	struct authentication_req *authr;	/* authentication request */
@@ -698,6 +699,9 @@  static void device_free(gpointer user_data)
 	if (device->discov_timer)
 		g_source_remove(device->discov_timer);
 
+	if (device->temporary_timer)
+		g_source_remove(device->temporary_timer);
+
 	if (device->connect)
 		dbus_message_unref(device->connect);
 
@@ -4232,12 +4236,34 @@  void device_set_le_support(struct btd_device *device, uint8_t bdaddr_type)
 	store_device_info(device);
 }
 
+static gboolean device_disappeared(gpointer user_data)
+{
+	struct btd_device *dev = user_data;
+
+	dev->temporary_timer = 0;
+
+	btd_adapter_remove_device(dev->adapter, dev);
+
+	return FALSE;
+}
+
 void device_update_last_seen(struct btd_device *device, uint8_t bdaddr_type)
 {
 	if (bdaddr_type == BDADDR_BREDR)
 		device->bredr_seen = time(NULL);
 	else
 		device->le_seen = time(NULL);
+
+	if (!device_is_temporary(device))
+		return;
+
+	/* Restart temporary timer */
+	if (device->temporary_timer)
+		g_source_remove(device->temporary_timer);
+
+	device->temporary_timer = g_timeout_add_seconds(main_opts.tmpto,
+							device_disappeared,
+							device);
 }
 
 /* It is possible that we have two device objects for the same device in
@@ -5610,10 +5636,18 @@  void btd_device_set_temporary(struct btd_device *device, bool temporary)
 
 	device->temporary = temporary;
 
+	if (device->temporary_timer) {
+		g_source_remove(device->temporary_timer);
+		device->temporary_timer = 0;
+	}
+
 	if (temporary) {
 		if (device->bredr)
 			adapter_whitelist_remove(device->adapter, device);
 		adapter_connect_list_remove(device->adapter, device);
+		device->temporary_timer = g_timeout_add_seconds(main_opts.tmpto,
+							device_disappeared,
+							device);
 		return;
 	}
 
diff --git a/src/hcid.h b/src/hcid.h
index c21ac9980..5f249ebf9 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -53,6 +53,7 @@  struct main_opts {
 	gboolean	pairable;
 	uint32_t	pairto;
 	uint32_t	discovto;
+	uint32_t	tmpto;
 	uint8_t		privacy;
 
 	struct {
diff --git a/src/main.c b/src/main.c
index bacb44197..ec7a9fbd7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,6 +67,7 @@ 
 
 #define DEFAULT_PAIRABLE_TIMEOUT       0 /* disabled */
 #define DEFAULT_DISCOVERABLE_TIMEOUT 180 /* 3 minutes */
+#define DEFAULT_TEMPORARY_TIMEOUT     30 /* 30 seconds */
 
 #define SHUTDOWN_GRACE_SECONDS 10
 
@@ -89,6 +90,7 @@  static const char *supported_options[] = {
 	"FastConnectable",
 	"Privacy",
 	"JustWorksRepairing",
+	"TemporaryTimeout",
 	NULL
 };
 
@@ -531,6 +533,16 @@  static void parse_config(GKeyFile *config)
 		g_free(str);
 	}
 
+	val = g_key_file_get_integer(config, "General",
+						"TemporaryTimeout", &err);
+	if (err) {
+		DBG("%s", err->message);
+		g_clear_error(&err);
+	} else {
+		DBG("tmpto=%d", val);
+		main_opts.tmpto = val;
+	}
+
 	str = g_key_file_get_string(config, "General", "Name", &err);
 	if (err) {
 		DBG("%s", err->message);
@@ -672,6 +684,7 @@  static void init_defaults(void)
 	main_opts.class = 0x000000;
 	main_opts.pairto = DEFAULT_PAIRABLE_TIMEOUT;
 	main_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT;
+	main_opts.tmpto = DEFAULT_TEMPORARY_TIMEOUT;
 	main_opts.reverse_discovery = TRUE;
 	main_opts.name_resolv = TRUE;
 	main_opts.debug_keys = FALSE;
diff --git a/src/main.conf b/src/main.conf
index 6a6f7d4b4..f41203b96 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -77,6 +77,11 @@ 
 # Defaults to "never"
 #JustWorksRepairing = never
 
+# How long to keep temporary devices around
+# The value is in seconds. Default is 30.
+# 0 = disable timer, i.e. never keep temporary devices
+#TemporaryTimeout = 30
+
 [Controller]
 # The following values are used to load default adapter parameters.  BlueZ loads
 # the values into the kernel before the adapter is powered if the kernel