diff options
| author | Grzegorz Kolodziejczyk <grzegorz.kolodziejczyk@tieto.com> | 2014-09-25 16:03:09 +0200 |
|---|---|---|
| committer | Szymon Janc <szymon.janc@tieto.com> | 2014-09-29 16:10:19 +0200 |
| commit | c9ddc13a26092708de6df11344e77848456af7be (patch) | |
| tree | ae73d4ce4941680f7759b8516aa597da23f69cd2 /android/tester-main.c | |
| parent | 16dffece61b6282e4944516fe29ad931665eafb8 (diff) | |
| download | bluez-c9ddc13a26092708de6df11344e77848456af7be.tar.gz | |
android/tester: Make client and server id unified
This makes unified id numers for both gatt server and client defined
as application id.
Diffstat (limited to 'android/tester-main.c')
| -rw-r--r-- | android/tester-main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/tester-main.c b/android/tester-main.c index 081a1cec1..61a6bcdd0 100644 --- a/android/tester-main.c +++ b/android/tester-main.c @@ -534,10 +534,10 @@ static bool match_data(struct step *step) return false; } - if (exp->callback_result.client_id != - step->callback_result.client_id) { - tester_debug("Callback client_id don't match"); - return false; + if (exp->callback_result.gatt_app_id != + step->callback_result.gatt_app_id) { + tester_debug("Callback gatt_app_id don't match"); + return false; } if (exp->callback_result.properties && @@ -1083,7 +1083,7 @@ static void gattc_connect_cb(int conn_id, int status, int client_if, step->callback = CB_GATTC_OPEN; step->callback_result.status = status; step->callback_result.conn_id = conn_id; - step->callback_result.client_id = client_if; + step->callback_result.gatt_app_id = client_if; /* Utilize property verification mechanism for bdaddr */ props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); @@ -1106,7 +1106,7 @@ static void gattc_disconnect_cb(int conn_id, int status, int client_if, step->callback = CB_GATTC_CLOSE; step->callback_result.status = status; step->callback_result.conn_id = conn_id; - step->callback_result.client_id = client_if; + step->callback_result.gatt_app_id = client_if; /* Utilize property verification mechanism for bdaddr */ props[0] = create_property(BT_PROPERTY_BDADDR, bda, sizeof(*bda)); |