[PATCH BlueZ v2 0/5] Add CS distance provider implementation

[PATCH BlueZ v2 0/5] Add CS distance provider implementation

[Naga Bhavani Akella]

From: Naga Bhavani Akella <nakella@qti.qualcomm.com>

This series documents and implements the D-Bus API that lets an
external ranging daemon compute Channel Sounding distance estimates
from the raw procedure data BlueZ reports, and feed them back for
reflection on the device's Channel Sounding interface

Patch 1 documents CSDistance1, the BlueZ-owned interface
that reflects the provider's DistanceMeters estimate for consumption
by desktop clients.

Patch 2 documents CSDistanceProvider, the interface the
registered provider implements to expose per-device distance
estimates.

Patch 3 documents CSDistanceProviderManager, which a
ranging daemon uses to register/unregister itself as a distance
provider.

Patch 4 and 5 implements CS Distance Provider and Provider Manager
interfaces


Naga Bhavani Akella (5):
  doc: Add org.bluez.CSDistance1 documentation
  doc: Add org.bluez.CSDistanceProvider documentation
  doc: Add org.bluez.CSDistanceProviderManager documentation
  rap: Add CS Distance provider D-Bus API
  client: Add CS distance display support to bluetoothctl

 Makefile.am                                 |  16 +-
 client/cs.c                                 |   2 +-
 client/cs.h                                 |   1 +
 client/main.c                               |  33 ++
 doc/org.bluez.CSDistance1.rst               |  36 ++
 doc/org.bluez.CSDistanceProvider.rst        |  32 ++
 doc/org.bluez.CSDistanceProviderManager.rst |  53 ++
 src/adapter.c                               |  12 +
 src/cs_distance.c                           | 578 ++++++++++++++++++++
 src/cs_distance.h                           |  23 +
 10 files changed, 783 insertions(+), 3 deletions(-)
 create mode 100644 doc/org.bluez.CSDistance1.rst
 create mode 100644 doc/org.bluez.CSDistanceProvider.rst
 create mode 100644 doc/org.bluez.CSDistanceProviderManager.rst
 create mode 100644 src/cs_distance.c
 create mode 100644 src/cs_distance.h

-- 

[PATCH BlueZ v2 1/5] doc: Add org.bluez.CSDistance1 documentation

[Naga Bhavani Akella]

Document the org.bluez.CSDistance1 interface, which
exposes the DistanceMeters estimate computed by an
external ranging provider registered via
CSDistanceProviderManager.
---
 Makefile.am                   |  9 +++++++--
 doc/org.bluez.CSDistance1.rst | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 doc/org.bluez.CSDistance1.rst

diff --git a/Makefile.am b/Makefile.am
index 19c468d3a..00b4ac2b1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -405,7 +405,8 @@ man_MANS += doc/org.bluez.Telephony.5 doc/org.bluez.Call.5
 man_MANS += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.Thermometer.5 \
 		doc/org.bluez.ThermometerWatcher.5
-man_MANS += doc/org.bluez.ChannelSounding1.5
+man_MANS += doc/org.bluez.ChannelSounding1.5 \
+	    doc/org.bluez.CSDistance1.5
 endif
 manual_pages += doc/bluetoothd.8
 manual_pages += doc/hci.7 doc/mgmt.7 doc/l2cap.7 doc/rfcomm.7 doc/sco.7 \
@@ -446,7 +447,8 @@ manual_pages += doc/org.bluez.Telephony.5 doc/org.bluez.Call.5
 manual_pages += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.Thermometer.5 \
 		doc/org.bluez.ThermometerWatcher.5
-manual_pages += doc/org.bluez.ChannelSounding1.5
+manual_pages += doc/org.bluez.ChannelSounding1.5 \
+	        doc/org.bluez.CSDistance1.5
 
 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
 			src/main.conf profiles/network/network.conf \
@@ -535,6 +537,9 @@ EXTRA_DIST += doc/org.bluez.ThermometerManager.rst \
 	      doc/org.bluez.Thermometer.rst \
 	      doc/org.bluez.ThermometerWatcher.rst
 
+EXTRA_DIST += doc/org.bluez.ChannelSounding1.rst \
+	      doc/org.bluez.CSDistance1.rst
+
 EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \
 		doc/pts-opp.txt
 
diff --git a/doc/org.bluez.CSDistance1.rst b/doc/org.bluez.CSDistance1.rst
new file mode 100644
index 000000000..6ee70596e
--- /dev/null
+++ b/doc/org.bluez.CSDistance1.rst
@@ -0,0 +1,36 @@
+======================
+org.bluez.CSDistance1
+======================
+
+-----------------------------------------
+BlueZ D-Bus CSDistance API documentation
+-----------------------------------------
+
+:Version: BlueZ
+:Date: July 2026
+:Manual section: 5
+:Manual group: Linux System Administration
+
+Interface
+=========
+
+:Service:	org.bluez
+:Interface:	org.bluez.CSDistance1
+:Object path:	[variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
+
+Properties
+----------
+
+double DistanceMeters [readonly]
+`````````````````````````````````
+
+Estimated distance to the remote device, in meters, as last computed
+from Channel Sounding measurement data.
+
+Providers from **org.bluez.CSDistanceProvider(5)** compute
+this value from the raw procedure data reported via the **ProcedureData**
+signal on **org.bluez.ChannelSounding1(5)**, and report it back to
+**bluetoothd(8)** for reflection here.
+
+This property emits ``PropertiesChanged`` whenever a new estimate is
+reported.
-- 

[PATCH BlueZ v2 2/5] doc: Add org.bluez.CSDistanceProvider documentation

[Naga Bhavani Akella]

Document the org.bluez.CSDistanceProvider interface,
implemented by external clients to expose per-device Channel Sounding
distance estimates that BlueZ reflects onto the corresponding device
object.
---
 Makefile.am                          |  9 +++++---
 doc/org.bluez.CSDistanceProvider.rst | 32 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 doc/org.bluez.CSDistanceProvider.rst

diff --git a/Makefile.am b/Makefile.am
index 00b4ac2b1..53bbfd0d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -406,7 +406,8 @@ man_MANS += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.Thermometer.5 \
 		doc/org.bluez.ThermometerWatcher.5
 man_MANS += doc/org.bluez.ChannelSounding1.5 \
-	    doc/org.bluez.CSDistance1.5
+	    doc/org.bluez.CSDistance1.5 \
+	    doc/org.bluez.CSDistanceProvider.5
 endif
 manual_pages += doc/bluetoothd.8
 manual_pages += doc/hci.7 doc/mgmt.7 doc/l2cap.7 doc/rfcomm.7 doc/sco.7 \
@@ -448,7 +449,8 @@ manual_pages += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.Thermometer.5 \
 		doc/org.bluez.ThermometerWatcher.5
 manual_pages += doc/org.bluez.ChannelSounding1.5 \
-	        doc/org.bluez.CSDistance1.5
+	        doc/org.bluez.CSDistance1.5 \
+	        doc/org.bluez.CSDistanceProvider.5
 
 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
 			src/main.conf profiles/network/network.conf \
@@ -538,7 +540,8 @@ EXTRA_DIST += doc/org.bluez.ThermometerManager.rst \
 	      doc/org.bluez.ThermometerWatcher.rst
 
 EXTRA_DIST += doc/org.bluez.ChannelSounding1.rst \
-	      doc/org.bluez.CSDistance1.rst
+	      doc/org.bluez.CSDistance1.rst \
+	      doc/org.bluez.CSDistanceProvider.rst
 
 EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \
 		doc/pts-opp.txt
diff --git a/doc/org.bluez.CSDistanceProvider.rst b/doc/org.bluez.CSDistanceProvider.rst
new file mode 100644
index 000000000..2d57dc8bd
--- /dev/null
+++ b/doc/org.bluez.CSDistanceProvider.rst
@@ -0,0 +1,32 @@
+============================
+org.bluez.CSDistanceProvider
+============================
+
+------------------------------------------------
+BlueZ D-Bus CSDistanceProvider API documentation
+------------------------------------------------
+
+:Version: BlueZ
+:Date: July 2026
+:Manual section: 5
+:Manual group: Linux System Administration
+
+Interface
+=========
+
+:Service:	<client D-Bus address>
+:Interface:	org.bluez.CSDistanceProvider1
+:Object path:	{provider_root}/{unique distance object path}
+
+Properties
+----------
+
+Objects provided on this interface contain the same properties as
+**org.bluez.ChannelSounding1(5)** interface. Additionally, this interface
+needs to have the Device property indicating the object path of the
+device this distance estimate provides.
+
+object Device [readonly]
+````````````````````````
+
+The object path of the device that this distance estimate applies to.
-- 

[PATCH BlueZ v2 3/5] doc: Add org.bluez.CSDistanceProviderManager documentation

[Naga Bhavani Akella]

Document the org.bluez.CSDistanceProviderManager
interface, used by external clients to register and unregister
themselves as Channel Sounding distance providers via
RegisterDistanceProvider/UnregisterDistanceProvider.
---
 Makefile.am                                 |  9 ++--
 doc/org.bluez.CSDistanceProviderManager.rst | 53 +++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 doc/org.bluez.CSDistanceProviderManager.rst

diff --git a/Makefile.am b/Makefile.am
index 53bbfd0d2..f003b041c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -407,7 +407,8 @@ man_MANS += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.ThermometerWatcher.5
 man_MANS += doc/org.bluez.ChannelSounding1.5 \
 	    doc/org.bluez.CSDistance1.5 \
-	    doc/org.bluez.CSDistanceProvider.5
+	    doc/org.bluez.CSDistanceProvider.5 \
+	    doc/org.bluez.CSDistanceProviderManager.5
 endif
 manual_pages += doc/bluetoothd.8
 manual_pages += doc/hci.7 doc/mgmt.7 doc/l2cap.7 doc/rfcomm.7 doc/sco.7 \
@@ -450,7 +451,8 @@ manual_pages += doc/org.bluez.ThermometerManager.5 \
 		doc/org.bluez.ThermometerWatcher.5
 manual_pages += doc/org.bluez.ChannelSounding1.5 \
 	        doc/org.bluez.CSDistance1.5 \
-	        doc/org.bluez.CSDistanceProvider.5
+	        doc/org.bluez.CSDistanceProvider.5 \
+	        doc/org.bluez.CSDistanceProviderManager.5
 
 EXTRA_DIST += src/genbuiltin src/bluetooth.conf \
 			src/main.conf profiles/network/network.conf \
@@ -541,7 +543,8 @@ EXTRA_DIST += doc/org.bluez.ThermometerManager.rst \
 
 EXTRA_DIST += doc/org.bluez.ChannelSounding1.rst \
 	      doc/org.bluez.CSDistance1.rst \
-	      doc/org.bluez.CSDistanceProvider.rst
+	      doc/org.bluez.CSDistanceProvider.rst \
+	      doc/org.bluez.CSDistanceProviderManager.rst
 
 EXTRA_DIST += doc/pics-opp.txt doc/pixit-opp.txt \
 		doc/pts-opp.txt
diff --git a/doc/org.bluez.CSDistanceProviderManager.rst b/doc/org.bluez.CSDistanceProviderManager.rst
new file mode 100644
index 000000000..efc01800d
--- /dev/null
+++ b/doc/org.bluez.CSDistanceProviderManager.rst
@@ -0,0 +1,53 @@
+====================================
+org.bluez.CSDistanceProviderManager
+====================================
+
+--------------------------------------------------------
+BlueZ D-Bus CSDistanceProviderManager API documentation
+--------------------------------------------------------
+
+:Version: BlueZ
+:Date: July 2026
+:Manual section: 5
+:Manual group: Linux System Administration
+
+Description
+===========
+
+A Channel Sounding distance provider starts by registering itself as a
+distance provider with the **RegisterDistanceProvider()** method passing
+an object path as the provider ID. Then, it can start exposing
+**org.bluez.CSDistanceProvider(5)** objects having the path
+starting with the given provider ID. It can also remove objects at any
+time.
+The objects and their properties exposed by distance providers will be
+reflected on the matching **org.bluez.CSDistance1(5)**
+interface.
+
+**bluetoothd(8)** will stop monitoring these exposed and removed objects
+after UnregisterDistanceProvider is called for that provider ID.
+
+Interface
+=========
+
+:Service:	org.bluez
+:Interface:	org.bluez.CSDistanceProviderManager1
+:Object path:	/org/bluez/{hci0,hci1,...}
+
+Methods
+-------
+
+void RegisterDistanceProvider(object provider)
+``````````````````````````````````````````````
+
+Registers a distance provider. A registered distance provider can then
+expose objects with **org.bluez.CSDistanceProvider(5)**
+interface.
+
+void UnregisterDistanceProvider(object provider)
+````````````````````````````````````````````````
+
+Unregisters a distance provider previously registered with
+**RegisterDistanceProvider()**. After unregistration, the
+**org.bluez.CSDistanceProvider(5)** objects provided by this
+client are ignored by **bluetoothd(8)**.
-- 

[PATCH BlueZ v2 4/5] rap: Add CS Distance provider D-Bus API

[Naga Bhavani Akella]

From: Naga Bhavani Akella <nakella@qti.qualcomm.com>

Introduce org.bluez.CSDistance1 and org.bluez.CSDistanceProvider1/
CSDistanceProviderManager1 D-Bus interfaces following the existing
Battery Provider design.

External providers can register a root path
via RegisterDistanceProvider and expose per-device
CSDistanceProvider1 objects; updates to their DistanceMeters
property are mirrored onto exported CSDistance1 objects via
btd_cs_distance_update(), emitting a PropertiesChanged signal.

The CS provider manager is wired into the adapter lifecycle,
created on adapter setup and destroyed on adapter
removal, mirroring how battery_provider_manager is handled.
---
 Makefile.am       |   1 +
 src/adapter.c     |  12 +
 src/cs_distance.c | 578 ++++++++++++++++++++++++++++++++++++++++++++++
 src/cs_distance.h |  23 ++
 4 files changed, 614 insertions(+)
 create mode 100644 src/cs_distance.c
 create mode 100644 src/cs_distance.h

diff --git a/Makefile.am b/Makefile.am
index f003b041c..b6ac8b866 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -332,6 +332,7 @@ bluetoothd_internal_sources = \
 			src/eir.h src/eir.c \
 			src/adv_monitor.h src/adv_monitor.c \
 			src/battery.h src/battery.c \
+			src/cs_distance.h src/cs_distance.c \
 			src/settings.h src/settings.c \
 			src/set.h src/set.c \
 			src/bearer.h src/bearer.c
diff --git a/src/adapter.c b/src/adapter.c
index c21b3e7fb..3b35c7ca0 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -67,6 +67,7 @@
 #include "adv_monitor.h"
 #include "eir.h"
 #include "battery.h"
+#include "cs_distance.h"
 
 #define MODE_OFF		0x00
 #define MODE_CONNECTABLE	0x01
@@ -336,6 +337,8 @@ struct btd_adapter {
 
 	struct btd_battery_provider_manager *battery_provider_manager;
 
+	struct btd_cs_distance_provider_manager *cs_distance_provider_manager;
+
 	GHashTable *allowed_uuid_set;	/* Set of allowed service UUIDs */
 
 	gboolean initialized;
@@ -7196,6 +7199,7 @@ static void adapter_remove(struct btd_adapter *adapter)
 {
 	GSList *l;
 	struct gatt_db *db;
+	struct btd_cs_distance_provider_manager *cs_distance_manager;
 
 	DBG("Removing adapter %s", adapter->path);
 
@@ -7230,6 +7234,11 @@ static void adapter_remove(struct btd_adapter *adapter)
 	btd_battery_provider_manager_destroy(adapter->battery_provider_manager);
 	adapter->battery_provider_manager = NULL;
 
+	cs_distance_manager = adapter->cs_distance_provider_manager;
+
+	btd_cs_distance_provider_manager_destroy(cs_distance_manager);
+	adapter->cs_distance_provider_manager = NULL;
+
 	g_slist_free(adapter->pin_callbacks);
 	adapter->pin_callbacks = NULL;
 
@@ -9645,6 +9654,9 @@ static int adapter_register(struct btd_adapter *adapter)
 	adapter->battery_provider_manager =
 		btd_battery_provider_manager_create(adapter);
 
+	adapter->cs_distance_provider_manager =
+		btd_cs_distance_provider_manager_create(adapter);
+
 	/* Don't start GATT database and advertising managers on
 	 * non-LE controllers.
 	 */
diff --git a/src/cs_distance.c b/src/cs_distance.c
new file mode 100644
index 000000000..ac2fd1d9c
--- /dev/null
+++ b/src/cs_distance.c
@@ -0,0 +1,578 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <glib.h>
+
+#include "gdbus/gdbus.h"
+#include "bluetooth/bluetooth.h"
+#include "src/shared/queue.h"
+#include "src/shared/util.h"
+#include "cs_distance.h"
+#include "dbus-common.h"
+#include "adapter.h"
+#include "device.h"
+#include "log.h"
+#include "error.h"
+
+#define CS_DISTANCE_INTERFACE "org.bluez.CSDistance1"
+#define CS_DISTANCE_PROVIDER_INTERFACE "org.bluez.CSDistanceProvider1"
+#define CS_DISTANCE_PROVIDER_MANAGER_INTERFACE \
+	"org.bluez.CSDistanceProviderManager1"
+
+struct btd_cs_distance {
+	char *path; /* D-Bus object path */
+	double meters; /* Estimated distance to the remote device */
+	bool has_value; /* false until the first estimate is reported */
+	char *provider_path; /* The provider root path, if any */
+};
+
+struct btd_cs_distance_provider_manager {
+	struct btd_adapter *adapter; /* Does not own pointer */
+	struct queue *providers;
+};
+
+struct cs_distance_provider {
+	struct btd_cs_distance_provider_manager *manager; /* Does not own */
+
+	char *owner; /* Owner D-Bus address */
+	char *path; /* D-Bus object path */
+
+	GDBusClient *client;
+};
+
+static struct queue *distances;
+
+static void provider_disconnect_cb(DBusConnection *conn, void *user_data);
+
+static void distance_add(struct btd_cs_distance *distance)
+{
+	if (!distances)
+		distances = queue_new();
+
+	queue_push_head(distances, distance);
+}
+
+static void distance_remove(struct btd_cs_distance *distance)
+{
+	queue_remove(distances, distance);
+	if (queue_isempty(distances)) {
+		queue_destroy(distances, NULL);
+		distances = NULL;
+	}
+}
+
+static bool match_path(const void *data, const void *user_data)
+{
+	const struct btd_cs_distance *distance = data;
+	const char *path = user_data;
+
+	return g_strcmp0(distance->path, path) == 0;
+}
+
+static struct btd_cs_distance *distance_new(const char *path,
+					    const char *provider_path)
+{
+	struct btd_cs_distance *distance;
+
+	distance = new0(struct btd_cs_distance, 1);
+	distance->path = g_strdup(path);
+	if (provider_path)
+		distance->provider_path = g_strdup(provider_path);
+
+	return distance;
+}
+
+static void distance_free(struct btd_cs_distance *distance)
+{
+	if (distance->path)
+		g_free(distance->path);
+
+	if (distance->provider_path)
+		g_free(distance->provider_path);
+
+	free(distance);
+}
+
+static gboolean property_distance_get(const GDBusPropertyTable *property,
+				      DBusMessageIter *iter, void *data)
+{
+	struct btd_cs_distance *distance = data;
+
+	dbus_message_iter_append_basic(iter, DBUS_TYPE_DOUBLE,
+				       &distance->meters);
+
+	return TRUE;
+}
+
+static gboolean property_distance_exists(const GDBusPropertyTable *property,
+					 void *data)
+{
+	struct btd_cs_distance *distance = data;
+
+	return distance->has_value;
+}
+
+static const GDBusPropertyTable cs_distance_properties[] = {
+	{ "DistanceMeters", "d", property_distance_get, NULL,
+	  property_distance_exists },
+	{}
+};
+
+struct btd_cs_distance *btd_cs_distance_register(const char *path,
+						 const char *provider_path)
+{
+	struct btd_cs_distance *distance;
+
+	DBG("path = %s", path);
+
+	if (queue_find(distances, match_path, path)) {
+		error("error registering CS distance: path exists");
+		return NULL;
+	}
+
+	if (!g_str_has_prefix(path, "/")) {
+		error("error registering CS distance: "
+		      "invalid D-Bus object path");
+		return NULL;
+	}
+
+	distance = distance_new(path, provider_path);
+	distance_add(distance);
+
+	if (!g_dbus_register_interface(btd_get_dbus_connection(),
+				       distance->path, CS_DISTANCE_INTERFACE,
+				       NULL, NULL, cs_distance_properties,
+				       distance, NULL)) {
+		error("error registering D-Bus interface for %s",
+		      distance->path);
+
+		distance_remove(distance);
+		distance_free(distance);
+
+		return NULL;
+	}
+
+	DBG("registered CSDistance object: %s", distance->path);
+
+	return distance;
+}
+
+bool btd_cs_distance_unregister(struct btd_cs_distance *distance)
+{
+	DBG("path = %s", distance->path);
+
+	if (!queue_find(distances, NULL, distance)) {
+		error("error unregistering CS distance: "
+		      "distance %s is not registered",
+		      distance->path);
+		return false;
+	}
+
+	if (!g_dbus_unregister_interface(btd_get_dbus_connection(),
+					 distance->path,
+					 CS_DISTANCE_INTERFACE)) {
+		error("error unregistering CS distance %s from "
+		      "D-Bus interface", distance->path);
+		return false;
+	}
+
+	distance_remove(distance);
+	distance_free(distance);
+
+	return true;
+}
+
+bool btd_cs_distance_update(struct btd_cs_distance *distance, double meters)
+{
+	DBG("path = %s", distance->path);
+
+	if (!queue_find(distances, NULL, distance)) {
+		error("error updating CS distance: distance is not "
+		      "registered");
+		return false;
+	}
+
+	distance->meters = meters;
+	distance->has_value = true;
+
+	info("CS distance updated: path = %s, meters = %f", distance->path,
+	     meters);
+	fprintf(stderr, "CS distance updated: path = %s, meters = %f\n",
+		distance->path, meters);
+
+	g_dbus_emit_property_changed(btd_get_dbus_connection(),
+				     distance->path, CS_DISTANCE_INTERFACE,
+				     "DistanceMeters");
+
+	return true;
+}
+
+static struct btd_cs_distance *find_distance_by_path(const char *path)
+{
+	return queue_find(distances, match_path, path);
+}
+
+static void provided_distance_property_changed_cb(GDBusProxy *proxy,
+						   const char *name,
+						   DBusMessageIter *iter,
+						   void *user_data)
+{
+	double meters = 0;
+	const char *export_path;
+	DBusMessageIter dev_iter;
+
+	if (g_dbus_proxy_get_property(proxy, "Device", &dev_iter) == FALSE)
+		return;
+
+	dbus_message_iter_get_basic(&dev_iter, &export_path);
+
+	if (strcmp(name, "DistanceMeters") != 0)
+		return;
+
+	if (iter) {
+		if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_DOUBLE)
+			return;
+
+		dbus_message_iter_get_basic(iter, &meters);
+	}
+
+	DBG("CS distance changed on %s, meters = %f",
+	    g_dbus_proxy_get_path(proxy), meters);
+
+	btd_cs_distance_update(find_distance_by_path(export_path), meters);
+}
+
+static void provided_distance_added_cb(GDBusProxy *proxy, void *user_data)
+{
+	struct cs_distance_provider *provider = user_data;
+	struct btd_cs_distance *distance;
+	struct btd_device *device;
+	const char *path = g_dbus_proxy_get_path(proxy);
+	const char *export_path;
+	double meters;
+	DBusMessageIter iter;
+
+	if (strcmp(g_dbus_proxy_get_interface(proxy),
+		   CS_DISTANCE_PROVIDER_INTERFACE) != 0)
+		return;
+
+	if (g_dbus_proxy_get_property(proxy, "Device", &iter) == FALSE) {
+		warn("CS distance object %s does not specify device path",
+		     path);
+		return;
+	}
+
+	dbus_message_iter_get_basic(&iter, &export_path);
+
+	device = btd_adapter_find_device_by_path(provider->manager->adapter,
+						 export_path);
+	if (!device || device_is_temporary(device)) {
+		warn("Ignoring non-existent device path for CS distance %s",
+		     export_path);
+		return;
+	}
+
+	if (find_distance_by_path(export_path)) {
+		DBG("CS distance for %s is already provided, ignoring the "
+		    "new one", export_path);
+		return;
+	}
+
+	g_dbus_proxy_set_property_watch(proxy,
+		provided_distance_property_changed_cb, provider);
+
+	distance = btd_cs_distance_register(export_path, provider->path);
+
+	DBG("provided CS distance added %s", path);
+
+	/* DistanceMeters property may not be immediately available, that's
+	 * okay since we monitor changes to this property.
+	 */
+	if (g_dbus_proxy_get_property(proxy, "DistanceMeters", &iter) == FALSE)
+		return;
+
+	dbus_message_iter_get_basic(&iter, &meters);
+
+	btd_cs_distance_update(distance, meters);
+}
+
+static void provided_distance_removed_cb(GDBusProxy *proxy, void *user_data)
+{
+	struct cs_distance_provider *provider = user_data;
+	struct btd_cs_distance *distance;
+	const char *export_path;
+	DBusMessageIter iter;
+
+	if (strcmp(g_dbus_proxy_get_interface(proxy),
+		   CS_DISTANCE_PROVIDER_INTERFACE) != 0)
+		return;
+
+	if (g_dbus_proxy_get_property(proxy, "Device", &iter) == FALSE)
+		return;
+
+	dbus_message_iter_get_basic(&iter, &export_path);
+
+	DBG("provided CS distance removed %s", g_dbus_proxy_get_path(proxy));
+
+	distance = find_distance_by_path(export_path);
+	if (!distance)
+		return;
+
+	if (g_strcmp0(distance->provider_path, provider->path) != 0)
+		return;
+
+	g_dbus_proxy_set_property_watch(proxy, NULL, NULL);
+
+	btd_cs_distance_unregister(distance);
+}
+
+static bool match_provider_path(const void *data, const void *user_data)
+{
+	const struct cs_distance_provider *provider = data;
+	const char *path = user_data;
+
+	return strcmp(provider->path, path) == 0;
+}
+
+static void unregister_if_path_has_prefix(void *data, void *user_data)
+{
+	struct btd_cs_distance *distance = data;
+	struct cs_distance_provider *provider = user_data;
+
+	if (g_strcmp0(distance->provider_path, provider->path) == 0)
+		btd_cs_distance_unregister(distance);
+}
+
+static void cs_distance_provider_free(gpointer data)
+{
+	struct cs_distance_provider *provider = data;
+
+	/* Unregister distances under the root path of provider->path */
+	queue_foreach(distances, unregister_if_path_has_prefix, provider);
+
+	if (provider->owner)
+		g_free(provider->owner);
+
+	if (provider->path)
+		g_free(provider->path);
+
+	if (provider->client) {
+		g_dbus_client_set_disconnect_watch(provider->client, NULL,
+						   NULL);
+		g_dbus_client_set_proxy_handlers(provider->client, NULL, NULL,
+						 NULL, NULL);
+		g_dbus_client_unref(provider->client);
+	}
+
+	free(provider);
+}
+
+static struct cs_distance_provider *
+cs_distance_provider_new(DBusConnection *conn,
+			 struct btd_cs_distance_provider_manager *manager,
+			 const char *path, const char *sender)
+{
+	struct cs_distance_provider *provider;
+
+	provider = new0(struct cs_distance_provider, 1);
+	provider->manager = manager;
+	provider->owner = g_strdup(sender);
+	provider->path = g_strdup(path);
+
+	provider->client = g_dbus_client_new_full(conn, sender, path, path);
+
+	if (!provider->client) {
+		error("error creating D-Bus client %s", path);
+		cs_distance_provider_free(provider);
+		return NULL;
+	}
+
+	g_dbus_client_set_disconnect_watch(provider->client,
+					   provider_disconnect_cb, provider);
+
+	g_dbus_client_set_proxy_handlers(provider->client,
+					 provided_distance_added_cb,
+					 provided_distance_removed_cb, NULL,
+					 provider);
+
+	return provider;
+}
+
+static void provider_disconnect_cb(DBusConnection *conn, void *user_data)
+{
+	struct cs_distance_provider *provider = user_data;
+	struct btd_cs_distance_provider_manager *manager = provider->manager;
+
+	DBG("CS distance provider client disconnected %s root path %s",
+	    provider->owner, provider->path);
+
+	if (!queue_find(manager->providers, NULL, provider)) {
+		warn("Disconnection on a non-existing provider %s",
+		     provider->path);
+		return;
+	}
+
+	queue_remove(manager->providers, provider);
+	cs_distance_provider_free(provider);
+}
+
+static DBusMessage *register_distance_provider(DBusConnection *conn,
+						DBusMessage *msg,
+						void *user_data)
+{
+	struct btd_cs_distance_provider_manager *manager = user_data;
+	const char *sender = dbus_message_get_sender(msg);
+	DBusMessageIter args;
+	const char *path;
+	struct cs_distance_provider *provider;
+
+	if (!dbus_message_iter_init(msg, &args))
+		return btd_error_invalid_args(msg);
+
+	if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_OBJECT_PATH)
+		return btd_error_invalid_args(msg);
+
+	dbus_message_iter_get_basic(&args, &path);
+
+	DBG("register CS distance provider path = %s", path);
+
+	if (!g_str_has_prefix(path, "/"))
+		return btd_error_invalid_args(msg);
+
+	if (queue_find(manager->providers, match_provider_path, path)) {
+		return dbus_message_new_error(msg,
+					      ERROR_INTERFACE ".AlreadyExists",
+					      "Provider already exists");
+	}
+
+	provider = cs_distance_provider_new(conn, manager, path, sender);
+	queue_push_head(manager->providers, provider);
+
+	return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage *unregister_distance_provider(DBusConnection *conn,
+						  DBusMessage *msg,
+						  void *user_data)
+{
+	struct btd_cs_distance_provider_manager *manager = user_data;
+	const char *sender = dbus_message_get_sender(msg);
+	DBusMessageIter args;
+	const char *path;
+	struct cs_distance_provider *provider;
+
+	if (!dbus_message_iter_init(msg, &args))
+		return btd_error_invalid_args(msg);
+
+	if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_OBJECT_PATH)
+		return btd_error_invalid_args(msg);
+
+	dbus_message_iter_get_basic(&args, &path);
+
+	DBG("unregister CS distance provider path = %s", path);
+
+	provider = queue_find(manager->providers, match_provider_path, path);
+	if (!provider || strcmp(provider->owner, sender) != 0) {
+		return dbus_message_new_error(msg,
+					      ERROR_INTERFACE ".DoesNotExist",
+					      "Provider does not exist");
+	}
+
+	queue_remove(manager->providers, provider);
+	cs_distance_provider_free(provider);
+
+	return dbus_message_new_method_return(msg);
+}
+
+static const GDBusMethodTable methods[] = {
+	{ GDBUS_METHOD("RegisterDistanceProvider",
+				    GDBUS_ARGS({ "provider", "o" }), NULL,
+				    register_distance_provider) },
+	{ GDBUS_METHOD("UnregisterDistanceProvider",
+				    GDBUS_ARGS({ "provider", "o" }), NULL,
+				    unregister_distance_provider) },
+	{}
+};
+
+static struct btd_cs_distance_provider_manager *
+manager_new(struct btd_adapter *adapter)
+{
+	struct btd_cs_distance_provider_manager *manager;
+
+	DBG("");
+
+	manager = new0(struct btd_cs_distance_provider_manager, 1);
+	manager->adapter = adapter;
+	manager->providers = queue_new();
+
+	return manager;
+}
+
+static void manager_free(struct btd_cs_distance_provider_manager *manager)
+{
+	if (!manager)
+		return;
+
+	DBG("");
+
+	queue_destroy(manager->providers, cs_distance_provider_free);
+
+	free(manager);
+}
+
+struct btd_cs_distance_provider_manager *
+btd_cs_distance_provider_manager_create(struct btd_adapter *adapter)
+{
+	struct btd_cs_distance_provider_manager *manager;
+
+	if (!adapter)
+		return NULL;
+
+	manager = manager_new(adapter);
+	if (!manager)
+		return NULL;
+
+	if (!g_dbus_register_interface(btd_get_dbus_connection(),
+				       adapter_get_path(manager->adapter),
+				       CS_DISTANCE_PROVIDER_MANAGER_INTERFACE,
+				       methods, NULL, NULL, manager, NULL)) {
+		error("error registering "
+		      CS_DISTANCE_PROVIDER_MANAGER_INTERFACE " interface");
+		manager_free(manager);
+		return NULL;
+	}
+
+	info("CS Distance Provider Manager created");
+
+	return manager;
+}
+
+void btd_cs_distance_provider_manager_destroy(struct
+	btd_cs_distance_provider_manager *manager)
+{
+	if (!manager)
+		return;
+
+	g_dbus_unregister_interface(btd_get_dbus_connection(),
+				    adapter_get_path(manager->adapter),
+				    CS_DISTANCE_PROVIDER_MANAGER_INTERFACE);
+
+	info("CS Distance Provider Manager destroyed");
+
+	manager_free(manager);
+}
diff --git a/src/cs_distance.h b/src/cs_distance.h
new file mode 100644
index 000000000..b3cccd5cb
--- /dev/null
+++ b/src/cs_distance.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ *
+ *
+ */
+
+struct btd_adapter;
+struct btd_cs_distance;
+struct btd_cs_distance_provider_manager;
+
+struct btd_cs_distance *btd_cs_distance_register(const char *path,
+						 const char *provider_path);
+bool btd_cs_distance_unregister(struct btd_cs_distance *distance);
+bool btd_cs_distance_update(struct btd_cs_distance *distance, double meters);
+
+struct btd_cs_distance_provider_manager *
+btd_cs_distance_provider_manager_create(struct btd_adapter *adapter);
+void btd_cs_distance_provider_manager_destroy(struct
+	btd_cs_distance_provider_manager *manager);
-- 

[PATCH BlueZ v2 5/5] client: Add CS distance display support to bluetoothctl

[Naga Bhavani Akella]

From: Naga Bhavani Akella <nakella@qti.qualcomm.com>

Track org.bluez.CSDistance1 proxies and append/remove
them on InterfacesAdded/InterfacesRemoved.

Print the DistanceMeters property on PropertiesChanged,
and show it under info option alongside the existing
Battery Percentage and CS Active properties.
---
 client/cs.c   |  2 +-
 client/cs.h   |  1 +
 client/main.c | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/client/cs.c b/client/cs.c
index 9f069589d..fd2270a51 100644
--- a/client/cs.c
+++ b/client/cs.c
@@ -303,7 +303,7 @@ static const char *cs_resolve_address(const char *address)
 }
 
 /* Find the ChannelSounding1 proxy for the device at the given object path. */
-static GDBusProxy *cs_find_proxy(const char *dev_path)
+GDBusProxy *cs_find_proxy(const char *dev_path)
 {
 	GDBusProxy *proxy;
 	const char *path;
diff --git a/client/cs.h b/client/cs.h
index 243d2a72b..fbf7ff954 100644
--- a/client/cs.h
+++ b/client/cs.h
@@ -16,3 +16,4 @@ void cs_device_disconnected(const char *dev_path);
 void cs_measurement_started(GDBusProxy *proxy);
 void cs_measurement_stopped(GDBusProxy *proxy);
 void cs_set_device_list(GList **devices);
+GDBusProxy *cs_find_proxy(const char *dev_path);
diff --git a/client/main.c b/client/main.c
index b5cad8afc..1fd00a786 100644
--- a/client/main.c
+++ b/client/main.c
@@ -69,6 +69,7 @@ static char *default_local_attr;
 static GDBusProxy *default_attr;
 static GList *ctrl_list;
 static GList *battery_proxies;
+static GList *cs_distance_proxies;
 
 static const char *agent_arguments[] = {
 	"on",
@@ -121,8 +122,10 @@ static void disconnect_handler(DBusConnection *connection, void *user_data)
 
 	g_list_free_full(ctrl_list, proxy_leak);
 	g_list_free_full(battery_proxies, proxy_leak);
+	g_list_free_full(cs_distance_proxies, proxy_leak);
 	ctrl_list = NULL;
 	battery_proxies = NULL;
+	cs_distance_proxies = NULL;
 
 	default_ctrl = NULL;
 	cs_set_device_list(NULL);
@@ -358,6 +361,16 @@ static void battery_removed(GDBusProxy *proxy)
 	battery_proxies = g_list_remove(battery_proxies, proxy);
 }
 
+static void cs_distance_added(GDBusProxy *proxy)
+{
+	cs_distance_proxies = g_list_append(cs_distance_proxies, proxy);
+}
+
+static void cs_distance_removed(GDBusProxy *proxy)
+{
+	cs_distance_proxies = g_list_remove(cs_distance_proxies, proxy);
+}
+
 static void device_added(GDBusProxy *proxy)
 {
 	DBusMessageIter iter;
@@ -531,6 +544,8 @@ static void proxy_added(GDBusProxy *proxy, void *user_data)
 		bearer_added(proxy);
 	} else if (!strcmp(interface, "org.bluez.ChannelSounding1")) {
 		cs_proxy_added(proxy);
+	} else if (!strcmp(interface, "org.bluez.CSDistance1")) {
+		cs_distance_added(proxy);
 	}
 }
 
@@ -664,6 +679,8 @@ static void proxy_removed(GDBusProxy *proxy, void *user_data)
 		bearer_removed(proxy);
 	} else if (!strcmp(interface, "org.bluez.ChannelSounding1")) {
 		cs_proxy_removed(proxy);
+	} else if (!strcmp(interface, "org.bluez.CSDistance1")) {
+		cs_distance_removed(proxy);
 	}
 }
 
@@ -843,6 +860,9 @@ static void property_changed(GDBusProxy *proxy, const char *name,
 			else
 				cs_measurement_stopped(proxy);
 		}
+	} else if (!strcmp(interface, "org.bluez.CSDistance1")) {
+		if (!strcmp(name, "DistanceMeters"))
+			print_property(proxy, "DistanceMeters");
 	}
 }
 
@@ -1882,6 +1902,8 @@ static void cmd_info(int argc, char *argv[])
 {
 	GDBusProxy *proxy;
 	GDBusProxy *battery_proxy;
+	GDBusProxy *cs_proxy;
+	GDBusProxy *cs_distance_proxy;
 	GDBusProxy *bearer;
 	DBusMessageIter iter;
 	const char *address;
@@ -1934,6 +1956,17 @@ static void cmd_info(int argc, char *argv[])
 	print_property_with_label(battery_proxy, "Percentage",
 					"Battery Percentage");
 
+	cs_proxy = cs_find_proxy(g_dbus_proxy_get_path(proxy));
+	if (cs_proxy)
+		print_property_with_label(cs_proxy, "Active",
+					"CS Session Active");
+
+	cs_distance_proxy = find_proxies_by_path(cs_distance_proxies,
+					g_dbus_proxy_get_path(proxy));
+	if (cs_distance_proxy)
+		print_property_with_label(cs_distance_proxy, "DistanceMeters",
+					"CS DistanceMeters");
+
 	bearer = find_proxies_by_iface(default_ctrl->bearers,
 				      g_dbus_proxy_get_path(proxy),
 				      "org.bluez.Bearer.BREDR1");
-- 

RE: Add CS distance provider implementation

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1144626

---Test result---

Test Summary:
CheckPatch                    FAIL      3.07 seconds
GitLint                       PASS      1.68 seconds
BuildEll                      PASS      20.03 seconds
BluezMake                     PASS      553.43 seconds
MakeCheck                     PASS      19.28 seconds
MakeDistcheck                 PASS      152.69 seconds
CheckValgrind                 PASS      217.60 seconds
CheckSmatch                   PASS      294.33 seconds
bluezmakeextell               PASS      95.15 seconds
IncrementalBuild              PASS      596.67 seconds
ScanBuild                     PASS      872.59 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v2,4/5] rap: Add CS Distance provider D-Bus API
ERROR:SPACING: need consistent spacing around '*' (ctx:WxV)
#812: FILE: src/cs_distance.c:566:
+	btd_cs_distance_provider_manager *manager)
 	                                 ^

ERROR:SPACING: need consistent spacing around '*' (ctx:WxV)
#853: FILE: src/cs_distance.h:23:
+	btd_cs_distance_provider_manager *manager);
 	                                 ^

/github/workspace/src/patch/14745271.patch total: 2 errors, 0 warnings, 650 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/patch/14745271.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.




https://github.com/bluez/bluez/pull/2397

---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ v2 0/5] Add CS distance provider implementation

[Luiz Augusto von Dentz]

Hi Naga,

On Wed, Aug 12, 2026 at 6:03 AM Naga Bhavani Akella
<naga.akella@oss.qualcomm.com> wrote:
>
> From: Naga Bhavani Akella <nakella@qti.qualcomm.com>
>
> This series documents and implements the D-Bus API that lets an
> external ranging daemon compute Channel Sounding distance estimates
> from the raw procedure data BlueZ reports, and feed them back for
> reflection on the device's Channel Sounding interface
>
> Patch 1 documents CSDistance1, the BlueZ-owned interface
> that reflects the provider's DistanceMeters estimate for consumption
> by desktop clients.
>
> Patch 2 documents CSDistanceProvider, the interface the
> registered provider implements to expose per-device distance
> estimates.
>
> Patch 3 documents CSDistanceProviderManager, which a
> ranging daemon uses to register/unregister itself as a distance
> provider.
>
> Patch 4 and 5 implements CS Distance Provider and Provider Manager
> interfaces

I would prefer to name it after the profile as just
org.bluez.Ranging*, it also doesn't hurt to document the relationship
of each interface with diagrams to ilustrate how to register and the
notify e.g. Ranging.PropertiesChanged("Distance", value). Regarding
the unit of measurement, do any specifications actually require it to
be a double and in meters, or was this picked based on some reference
implementation? We could perhaps simplify it to use centimeters, or
even millimeters, in a uint32. That would give plenty of range without
requiring floating-point math.

>
> Naga Bhavani Akella (5):
>   doc: Add org.bluez.CSDistance1 documentation
>   doc: Add org.bluez.CSDistanceProvider documentation
>   doc: Add org.bluez.CSDistanceProviderManager documentation
>   rap: Add CS Distance provider D-Bus API
>   client: Add CS distance display support to bluetoothctl
>
>  Makefile.am                                 |  16 +-
>  client/cs.c                                 |   2 +-
>  client/cs.h                                 |   1 +
>  client/main.c                               |  33 ++
>  doc/org.bluez.CSDistance1.rst               |  36 ++
>  doc/org.bluez.CSDistanceProvider.rst        |  32 ++
>  doc/org.bluez.CSDistanceProviderManager.rst |  53 ++
>  src/adapter.c                               |  12 +
>  src/cs_distance.c                           | 578 ++++++++++++++++++++
>  src/cs_distance.h                           |  23 +

This becomes src/ranging.{c, h}

>  10 files changed, 783 insertions(+), 3 deletions(-)
>  create mode 100644 doc/org.bluez.CSDistance1.rst
>  create mode 100644 doc/org.bluez.CSDistanceProvider.rst
>  create mode 100644 doc/org.bluez.CSDistanceProviderManager.rst
>  create mode 100644 src/cs_distance.c
>  create mode 100644 src/cs_distance.h
>
> --
>


-- 
Luiz Augusto von Dentz