gatt-client: when disconnected return default MTU for GattCharacteristic1.MTU
PATCH 1/1 gatt-client: when disconnected return default MTU for GattCharacteristic1.MTU
From: "Javier de San Pedro" <[email protected]>
After the MTU dbus property patches in 5.62 we are seeing bluetoothd terminate frequently with "Disconnected from D-Bus. Exiting." msgs. Apparently this is because bluetoothd sent an invalid reply to a D-Bus Property Get (for GattCharacteristic1's MTU).
Multiple issues in bluez Github.com project reported similar behavior; at least #235 (see Fixes:), #219, and likely #238.
When the Characteristic1 object is still cached/alive, but the underlying att connection is not (e.g. someone just called Disconnect), the property getter (characteristic_get_mtu) right now returns false. However, gdbus seems to ignore the return value and sends the empty reply message anyway (rather than a dbus error?), and this seems to cause the dbus connection to be terminated (due to the ill-formed reply?). bluetoothd then aborts.
This patch makes the property value BT_ATT_DEFAULT_LE_MTU if the underlying att object does not exist, rather than returning an invalid message. This is consistent with the existing PropertyChanged signal behavior (we will emit a PropertyChange only if a larger MTU is exchanged), and fixes the issue on my machines.
An alternative could be to change gdbus behavior, but I'm not sure if we are allowed to return an error here anyway without causing problems in other dbus libraries/wrappers.
--- src/gatt-client.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
src/gatt-client.c +1 -4
@@ -883,10 +883,7 @@ static gboolean characteristic_get_mtu(const GDBusPropertyTable *property,uint16_t mtu; att =bt_gatt_client_get_att (gatt); -if (!att) -return FALSE; - - mtu =bt_att_get_mtu (att); + mtu = att ?bt_att_get_mtu (att) :BT_ATT_DEFAULT_LE_MTU ;dbus_message_iter_append_basic (iter,DBUS_TYPE_UINT16 , &mtu);
Signature · 1 line
2.34.0
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=586773
---Test result---
Test Summary:
CheckPatch PASS 1.34 seconds GitLint PASS 0.93 seconds Prep - Setup ELL PASS 51.78 seconds Build - Prep PASS 0.51 seconds Build - Configure PASS 9.44 seconds Build - Make PASS 222.52 seconds Make Check PASS 9.90 seconds Make Distcheck PASS 263.17 seconds Build w/ext ELL - Configure PASS 9.56 seconds Build w/ext ELL - Make PASS 209.87 seconds
---
Regards,
Linux Bluetooth
Hi Javier,
Quoted 25 lines · On Mon, Nov 29, 2021 at 1:14 PM <[email protected]> wrote:
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=586773---Test result---
Test Summary:
CheckPatch PASS 1.34 seconds GitLint PASS 0.93 seconds Prep - Setup ELL PASS 51.78 seconds Build - Prep PASS 0.51 seconds Build - Configure PASS 9.44 seconds Build - Make PASS 222.52 seconds Make Check PASS 9.90 seconds Make Distcheck PASS 263.17 seconds Build w/ext ELL - Configure PASS 9.56 seconds Build w/ext ELL - Make PASS 209.87 seconds
Quoted 3 lines
---
Regards,
Linux Bluetooth
Applied, thanks.
Signature · 1 line
Luiz Augusto von Dentz