From e5e9af0cca9cf5d5521f186f5726f75ae84433f7 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 10 Feb 2015 21:00:28 +0100 Subject: [PATCH] android/gatt: Improve MTU exchange debug logs This makes logs more usable. --- android/gatt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/android/gatt.c b/android/gatt.c index a36922cf5..1a6de64f9 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -974,8 +974,6 @@ static bool get_local_mtu(struct gatt_device *dev, uint16_t *mtu) if (mtu) *mtu = MIN(imtu, omtu); - DBG("mtu %u", *mtu); - return true; } @@ -983,16 +981,16 @@ static bool update_mtu(struct gatt_device *device, uint16_t rmtu) { uint16_t mtu, lmtu; - DBG("%u", rmtu); + if (!get_local_mtu(device, &lmtu)) + return false; + + DBG("remote_mtu:%d local_mtu:%d", rmtu, lmtu); if (rmtu < ATT_DEFAULT_LE_MTU) { error("gatt: remote MTU invalid (%u bytes)", rmtu); return false; } - if (!get_local_mtu(device, &lmtu)) - return false; - mtu = MIN(lmtu, rmtu); if (mtu == ATT_DEFAULT_LE_MTU) @@ -1003,8 +1001,6 @@ static bool update_mtu(struct gatt_device *device, uint16_t rmtu) return false; } - DBG("remote_mtu:%d local_mtu:%d", rmtu, lmtu); - return true; } @@ -1016,6 +1012,8 @@ static void exchange_mtu_cb(guint8 status, const guint8 *pdu, guint16 plen, struct gatt_device *device = user_data; uint16_t rmtu; + DBG(""); + if (status) { error("gatt: MTU exchange: %s", att_ecode2str(status)); goto failed; @@ -1039,6 +1037,8 @@ static void send_exchange_mtu_request(struct gatt_device *device) if (!get_local_mtu(device, &mtu)) return; + DBG("mtu %u", mtu); + if (!gatt_exchange_mtu(device->attrib, mtu, exchange_mtu_cb, device_ref(device))) device_unref(device); -- 2.47.3