From 4ca0a7861b474e4d0f7f5ba7e1bbfc496dab7132 Mon Sep 17 00:00:00 2001 From: Lukasz Rymanowski Date: Mon, 22 Sep 2014 12:54:06 +0200 Subject: [PATCH] android/bluetooth: Extend bt_update_sign_counter function with value With this patch, gatt can set any value to each local/remote signed counter. It is need by next patch. --- android/bluetooth.c | 7 ++++--- android/bluetooth.h | 3 ++- android/gatt.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index 3016ea489..827e2055f 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -4145,7 +4145,8 @@ static void store_sign_counter(struct device *dev, enum bt_csrk_type type) g_key_file_free(key_file); } -void bt_update_sign_counter(const bdaddr_t *addr, enum bt_csrk_type type) +void bt_update_sign_counter(const bdaddr_t *addr, enum bt_csrk_type type, + uint32_t val) { struct device *dev; @@ -4154,9 +4155,9 @@ void bt_update_sign_counter(const bdaddr_t *addr, enum bt_csrk_type type) return; if (type == LOCAL_CSRK) - dev->local_sign_cnt++; + dev->local_sign_cnt = val; else - dev->remote_sign_cnt++; + dev->remote_sign_cnt = val; store_sign_counter(dev, type); } diff --git a/android/bluetooth.h b/android/bluetooth.h index fffb3cc34..897055989 100644 --- a/android/bluetooth.h +++ b/android/bluetooth.h @@ -72,7 +72,8 @@ bool bt_read_device_rssi(const bdaddr_t *addr, bt_read_device_rssi_done cb, bool bt_get_csrk(const bdaddr_t *addr, enum bt_csrk_type type, uint8_t key[16], uint32_t *sign_cnt); -void bt_update_sign_counter(const bdaddr_t *addr, enum bt_csrk_type type); +void bt_update_sign_counter(const bdaddr_t *addr, enum bt_csrk_type type, + uint32_t val); void bt_store_gatt_ccc(const bdaddr_t *addr, uint16_t value); diff --git a/android/gatt.c b/android/gatt.c index ad20a7152..e1d7df2d8 100644 --- a/android/gatt.c +++ b/android/gatt.c @@ -3169,7 +3169,7 @@ static guint signed_write_cmd(struct gatt_device *dev, uint16_t handle, return 0; } - bt_update_sign_counter(&dev->bdaddr, LOCAL_CSRK); + bt_update_sign_counter(&dev->bdaddr, LOCAL_CSRK, sign_cnt++); return res; } @@ -5941,7 +5941,7 @@ static void write_signed_cmd_request(const uint8_t *cmd, uint16_t cmd_len, return; } /* Signature OK, proceed with write */ - bt_update_sign_counter(&dev->bdaddr, REMOTE_CSRK); + bt_update_sign_counter(&dev->bdaddr, REMOTE_CSRK, sign_cnt++); gatt_db_write(gatt_db, handle, 0, value, vlen, cmd[0], &dev->bdaddr); } -- 2.47.3