From patchwork Fri Jun 10 22:11:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Brudevold X-Patchwork-Id: 580759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A90C6C43334 for ; Fri, 10 Jun 2022 22:12:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348857AbiFJWMC (ORCPT ); Fri, 10 Jun 2022 18:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348664AbiFJWMA (ORCPT ); Fri, 10 Jun 2022 18:12:00 -0400 Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFD031F7A75 for ; Fri, 10 Jun 2022 15:11:58 -0700 (PDT) Received: by mail-il1-x132.google.com with SMTP id y17so309176ilj.11 for ; Fri, 10 Jun 2022 15:11:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sskVVK6JzOG7aqmtDXfb/Vju/qskr/CFoR9V2qIT/J4=; b=QWziiZ9bdPRc8BM3EkzHlt7tmT/z5Dl6u+hdtFzkH/wtVHnOTBBzvudbEL5gVhzdsL FjftJ4IWn6VkOU/HlXa/0/uZvMX5xk0y65NemcYVKuOjAZVTv2+h4vvGlVJYsmF7BLuB HbZT4b5ELujSbM/dy0pIc03nNCtPzYEyGRYTG3MfCMTwC3x2zrlpxN+bRPaYJr4f8Oa1 ANo8RkW+lISSRTTtmKWyBI6b81+9MUs8d6XQvNk96bM4Kn+tX7NbaK+yOObTQxVqJlAP AxDu+Ebo4BJKS1xLnUlkTAXjj4evd0nn01pXcyM6u7+zono9GmbtFohu9jALzeb+j0T8 grig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sskVVK6JzOG7aqmtDXfb/Vju/qskr/CFoR9V2qIT/J4=; b=KKFiDcYQbjywH0Kq+FSgYxB4XLkI17J5wLRDv3JSFdvOG+yTCEo4wErFN+l90qeqhc 8p59HogOyKOJa+M6RJKzFTw0YHyeT8Pc4dvEkwPyPalk0BiQjlcalO9/0g6mCSKlY+bo Yfv6b+YMRX0gQlKPex8Azp9TQ2wOyDt/07Ft6ledNbGt5VZHVe8mJK4evcOjUYhCpx+t 67KjovnoeoRswxl89aSXMRA9ojM3bbz6P7kcSltHrci7kf1qevm/i1PArDYB72d51sd5 HRSkWv3uh5ibikOGz2vc/9D8iAWOZrtJFNJ+IqWIZWfZep9SQZM45/r8PxdCOEbIEmO0 1PLQ== X-Gm-Message-State: AOAM533Nd5arHqB/C5Qho+7DX9ElRGrF+xrZCxjCKgwhwaUo6vxSuCc5 akb9m1QUuZidtmMvH5aSvR98p31k9Vs= X-Google-Smtp-Source: ABdhPJxAdjopnKH8QZLy9J7JVzcUJ9RW3OF8c62zbLZXbwuLgopdj1wBC7HFv2EtLJyZB9LbsTLrXw== X-Received: by 2002:a05:6e02:b4e:b0:2d3:dd2a:5d58 with SMTP id f14-20020a056e020b4e00b002d3dd2a5d58mr26139473ilu.26.1654899117998; Fri, 10 Jun 2022 15:11:57 -0700 (PDT) Received: from localhost.localdomain (c-68-47-51-143.hsd1.mn.comcast.net. [68.47.51.143]) by smtp.gmail.com with ESMTPSA id k5-20020a026605000000b0032b3a7817b3sm117544jac.119.2022.06.10.15.11.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 15:11:57 -0700 (PDT) From: Michael Brudevold To: linux-bluetooth@vger.kernel.org Cc: Michael Brudevold Subject: [PATCH v2 1/3] eir: parse data types for LE OOB pairing Date: Fri, 10 Jun 2022 17:11:22 -0500 Message-Id: <20220610221124.18591-2-puffy.taco@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610221124.18591-1-puffy.taco@gmail.com> References: <20220610221124.18591-1-puffy.taco@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Michael Brudevold LE support added for P-256 and split out from existing BREDR support for P-192 Also attempt to free any existing values before setting new values --- plugins/neard.c | 8 ++++---- src/eir.c | 41 +++++++++++++++++++++++++++++++++++------ src/eir.h | 10 ++++++++-- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/plugins/neard.c b/plugins/neard.c index 99762482c..11d9e91c4 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -352,11 +352,11 @@ static int process_eir(uint8_t *eir, size_t size, struct oob_params *remote) remote->services = eir_data.services; eir_data.services = NULL; - remote->hash = eir_data.hash; - eir_data.hash = NULL; + remote->hash = eir_data.hash192; + eir_data.hash192 = NULL; - remote->randomizer = eir_data.randomizer; - eir_data.randomizer = NULL; + remote->randomizer = eir_data.randomizer192; + eir_data.randomizer192 = NULL; eir_data_free(&eir_data); diff --git a/src/eir.c b/src/eir.c index 2f9ee036f..79d423074 100644 --- a/src/eir.c +++ b/src/eir.c @@ -53,10 +53,14 @@ void eir_data_free(struct eir_data *eir) eir->services = NULL; g_free(eir->name); eir->name = NULL; - free(eir->hash); - eir->hash = NULL; - free(eir->randomizer); - eir->randomizer = NULL; + free(eir->hash192); + eir->hash192 = NULL; + free(eir->randomizer192); + eir->randomizer192 = NULL; + free(eir->hash256); + eir->hash256 = NULL; + free(eir->randomizer256); + eir->randomizer256 = NULL; g_slist_free_full(eir->msd_list, g_free); eir->msd_list = NULL; g_slist_free_full(eir->sd_list, sd_free); @@ -323,13 +327,15 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) case EIR_SSP_HASH: if (data_len < 16) break; - eir->hash = util_memdup(data, 16); + free(eir->hash192); + eir->hash192 = util_memdup(data, 16); break; case EIR_SSP_RANDOMIZER: if (data_len < 16) break; - eir->randomizer = util_memdup(data, 16); + free(eir->randomizer192); + eir->randomizer192 = util_memdup(data, 16); break; case EIR_DEVICE_ID: @@ -342,6 +348,15 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) eir->did_version = data[6] | (data[7] << 8); break; + case EIR_LE_DEVICE_ADDRESS: + if (data_len < sizeof(bdaddr_t) + 1) + break; + + memcpy(&eir->addr, data, sizeof(bdaddr_t)); + eir->addr_type = data[sizeof(bdaddr_t)] & 0x1 ? + BDADDR_LE_RANDOM : BDADDR_LE_PUBLIC; + break; + case EIR_SVC_DATA16: eir_parse_uuid16_data(eir, data, data_len); break; @@ -354,6 +369,20 @@ void eir_parse(struct eir_data *eir, const uint8_t *eir_data, uint8_t eir_len) eir_parse_uuid128_data(eir, data, data_len); break; + case EIR_LE_SC_CONF: + if (data_len < 16) + break; + free(eir->hash256); + eir->hash256 = util_memdup(data, 16); + break; + + case EIR_LE_SC_RAND: + if (data_len < 16) + break; + free(eir->randomizer256); + eir->randomizer256 = util_memdup(data, 16); + break; + case EIR_MANUFACTURER_DATA: eir_parse_msd(eir, data, data_len); break; diff --git a/src/eir.h b/src/eir.h index 6154e23ec..b2cf00f37 100644 --- a/src/eir.h +++ b/src/eir.h @@ -33,9 +33,12 @@ #define EIR_PUB_TRGT_ADDR 0x17 /* LE: Public Target Address */ #define EIR_RND_TRGT_ADDR 0x18 /* LE: Random Target Address */ #define EIR_GAP_APPEARANCE 0x19 /* GAP appearance */ +#define EIR_LE_DEVICE_ADDRESS 0x1B /* LE: Bluetooth Device Address */ #define EIR_SOLICIT32 0x1F /* LE: Solicit UUIDs, 32-bit */ #define EIR_SVC_DATA32 0x20 /* LE: Service data, 32-bit UUID */ #define EIR_SVC_DATA128 0x21 /* LE: Service data, 128-bit UUID */ +#define EIR_LE_SC_CONF 0x22 /* LE: Secure Connections Confirmation Value */ +#define EIR_LE_SC_RAND 0x23 /* LE: Secure Connections Random Value */ #define EIR_TRANSPORT_DISCOVERY 0x26 /* Transport Discovery Service */ #define EIR_MANUFACTURER_DATA 0xFF /* Manufacturer Specific Data */ @@ -77,9 +80,12 @@ struct eir_data { uint16_t appearance; bool name_complete; int8_t tx_power; - uint8_t *hash; - uint8_t *randomizer; + uint8_t *hash192; + uint8_t *randomizer192; + uint8_t *hash256; + uint8_t *randomizer256; bdaddr_t addr; + uint8_t addr_type; uint16_t did_vendor; uint16_t did_product; uint16_t did_version; From patchwork Fri Jun 10 22:11:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Brudevold X-Patchwork-Id: 581165 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 607C2CCA47B for ; Fri, 10 Jun 2022 22:12:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348949AbiFJWMC (ORCPT ); Fri, 10 Jun 2022 18:12:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348751AbiFJWMB (ORCPT ); Fri, 10 Jun 2022 18:12:01 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 125872E29A8 for ; Fri, 10 Jun 2022 15:12:00 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id f12so339830ilj.1 for ; Fri, 10 Jun 2022 15:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aJu4X1AfbG2KjMR6LUiax3lK7JMlrFmkj3HNPVMjbpM=; b=pAWtUuPX3JRUlcrUXWsK/nGcErDu6CPAyLfQEgXauYJs9b18ccBj9iLg3cVVPDZ+R1 OycuAtLngOAViLr967KFDq1nmgJC7bft0DQNom9RKqMx939p0fmTQ67HQM6RfAI8nx0D tZm94J41YiICURrWYbdM3G7bKUZMvsdcsL9DhW478Rmc1h6LiR9DEGqwUaxVTyrZ4GgE Obg2Qz0NVjBOc0y60iQNprn4HuUAE5Asy2C1TJmz2Wu6MTfVp83a7XIzPt1s2qmKXe90 gUGNlNCKBjth0iSK4Wxk2l6P4nGbel/garmziTIArezSvHquebn84A527p8e69JdzaAr W+nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aJu4X1AfbG2KjMR6LUiax3lK7JMlrFmkj3HNPVMjbpM=; b=NbqvB1CGPnDGaeXj9vSrkt3Ts/f2ZoMDtF2ybohAw/uK7smjSAjf2Iuy9IdM/EFQIZ UdDqeuZatGvnweFgLAk7thlJGrhPJRZFbDKZKxaCz+adwSS0U0S3MSlyc5x4i8JUlweM vomYtO6UjB0yo3mFqv19sJhCTQUz9AEUK8MXIlLf1z6y55pnWQdtiarGa11GqVc4lqMp leFzlG89ovkad54flLajj1vloaSe+eSYBRgNXldCXU0HlmTp1iLiB4A7BdQv/F1HhiSg hd92j68lN1K1bbnIgm1Gqiig6hjqsC+hwgU6Tg8PU+5jD5RguQ07IDeQvrH1eGs3SNvm py+w== X-Gm-Message-State: AOAM53069aoqquoqSRum73R7H8CkV8UM2Sjm671JzT9PvZ3Ut0zXpWnK 0vA12N/mROBISrmuLng5T7cAHreaTbE= X-Google-Smtp-Source: ABdhPJxr3iln4tpVZ6REUkmkevPK+qU8m28JB/u9kzwyFM0AboVdKzO9Ju/QzhfmippDT1ZXr5IOLQ== X-Received: by 2002:a05:6e02:1b02:b0:2d2:f327:59c3 with SMTP id i2-20020a056e021b0200b002d2f32759c3mr26911061ilv.219.1654899119135; Fri, 10 Jun 2022 15:11:59 -0700 (PDT) Received: from localhost.localdomain (c-68-47-51-143.hsd1.mn.comcast.net. [68.47.51.143]) by smtp.gmail.com with ESMTPSA id k5-20020a026605000000b0032b3a7817b3sm117544jac.119.2022.06.10.15.11.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 15:11:58 -0700 (PDT) From: Michael Brudevold To: linux-bluetooth@vger.kernel.org Cc: Michael Brudevold Subject: [PATCH v2 2/3] Accept LE formatted EIR data with neard plugin Date: Fri, 10 Jun 2022 17:11:23 -0500 Message-Id: <20220610221124.18591-3-puffy.taco@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610221124.18591-1-puffy.taco@gmail.com> References: <20220610221124.18591-1-puffy.taco@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Michael Brudevold LE EIR differs from BREDR EIR in that it does not start with the device address. Add ability to handle this data and send the correct address type when adding remote OOB. BREDR support remains for P-192; P-256 is not added. This patch does not address requesting LE OOB data. --- plugins/neard.c | 86 ++++++++++++++++++++++++++++++++++++++++--------- src/adapter.c | 19 ++++++++--- src/adapter.h | 5 +-- 3 files changed, 88 insertions(+), 22 deletions(-) diff --git a/plugins/neard.c b/plugins/neard.c index 11d9e91c4..e03f981e0 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -56,11 +56,14 @@ enum cps { struct oob_params { bdaddr_t address; + uint8_t address_type; uint32_t class; char *name; GSList *services; - uint8_t *hash; - uint8_t *randomizer; + uint8_t *hash192; + uint8_t *randomizer192; + uint8_t *hash256; + uint8_t *randomizer256; uint8_t *pin; int pin_len; enum cps power_state; @@ -70,8 +73,10 @@ static void free_oob_params(struct oob_params *params) { g_slist_free_full(params->services, free); g_free(params->name); - g_free(params->hash); - g_free(params->randomizer); + g_free(params->hash192); + g_free(params->randomizer192); + g_free(params->hash256); + g_free(params->randomizer256); free(params->pin); } @@ -352,10 +357,10 @@ static int process_eir(uint8_t *eir, size_t size, struct oob_params *remote) remote->services = eir_data.services; eir_data.services = NULL; - remote->hash = eir_data.hash192; + remote->hash192 = eir_data.hash192; eir_data.hash192 = NULL; - remote->randomizer = eir_data.randomizer192; + remote->randomizer192 = eir_data.randomizer192; eir_data.randomizer192 = NULL; eir_data_free(&eir_data); @@ -363,6 +368,36 @@ static int process_eir(uint8_t *eir, size_t size, struct oob_params *remote) return 0; } +static void process_eir_le(uint8_t *eir, size_t size, struct oob_params *remote) +{ + struct eir_data eir_data; + + DBG("size %zu", size); + + memset(&eir_data, 0, sizeof(eir_data)); + + eir_parse(&eir_data, eir, size); + + bacpy(&remote->address, &eir_data.addr); + remote->address_type = eir_data.addr_type; + + remote->class = eir_data.class; + + remote->name = eir_data.name; + eir_data.name = NULL; + + remote->services = eir_data.services; + eir_data.services = NULL; + + remote->hash256 = eir_data.hash256; + eir_data.hash256 = NULL; + + remote->randomizer256 = eir_data.randomizer256; + eir_data.randomizer256 = NULL; + + eir_data_free(&eir_data); +} + /* * This is (barely documented) Nokia extension format, most work was done by * reverse engineering. @@ -543,7 +578,7 @@ static int process_message(DBusMessage *msg, struct oob_params *remote) uint8_t *eir; int size; - /* nokia.com:bt and EIR should not be passed together */ + /* nokia.com:bt, EIR, and EIR.le should not be passed together */ if (bacmp(&remote->address, BDADDR_ANY) != 0) goto error; @@ -561,7 +596,7 @@ static int process_message(DBusMessage *msg, struct oob_params *remote) uint8_t *data; int size; - /* nokia.com:bt and EIR should not be passed together */ + /* nokia.com:bt, EIR, and EIR.le should not be passed together */ if (bacmp(&remote->address, BDADDR_ANY) != 0) goto error; @@ -574,6 +609,23 @@ static int process_message(DBusMessage *msg, struct oob_params *remote) if (process_nokia_com_bt(data, size, remote)) goto error; + } else if (strcasecmp(key, "EIR.le") == 0) { + DBusMessageIter array; + uint8_t *eir; + int size; + + /* nokia.com:bt, EIR, and EIR.le should not be passed together */ + if (bacmp(&remote->address, BDADDR_ANY) != 0) + goto error; + + if (dbus_message_iter_get_arg_type(&value) != + DBUS_TYPE_ARRAY) + goto error; + + dbus_message_iter_recurse(&value, &array); + dbus_message_iter_get_fixed_array(&array, &eir, &size); + + process_eir_le(eir, size, remote); } else if (strcasecmp(key, "State") == 0) { const char *state; @@ -635,10 +687,13 @@ static void store_params(struct btd_adapter *adapter, struct btd_device *device, if (params->services) device_add_eir_uuids(device, params->services); - if (params->hash) { + if (params->hash192 || params->hash256) { btd_adapter_add_remote_oob_data(adapter, ¶ms->address, - params->hash, - params->randomizer); + params->address_type, + params->hash192, + params->randomizer192, + params->hash256, + params->randomizer256); } else if (params->pin_len) { /* TODO * Handle PIN, for now only discovery mode and 'common' PINs @@ -692,7 +747,7 @@ static DBusMessage *push_oob(DBusConnection *conn, DBusMessage *msg, void *data) } device = btd_adapter_get_device(adapter, &remote.address, - BDADDR_BREDR); + remote.address_type); err = check_device(device); if (err < 0) { @@ -716,7 +771,7 @@ static DBusMessage *push_oob(DBusConnection *conn, DBusMessage *msg, void *data) free_oob_params(&remote); err = adapter_create_bonding(adapter, device_get_address(device), - BDADDR_BREDR, io_cap); + remote.address_type, io_cap); if (err < 0) return error_reply(msg, -err); @@ -764,7 +819,8 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg, goto done; } - device = btd_adapter_get_device(adapter, &remote.address, BDADDR_BREDR); + device = btd_adapter_get_device(adapter, &remote.address, + remote.address_type); err = check_device(device); if (err < 0) @@ -777,7 +833,7 @@ static DBusMessage *request_oob(DBusConnection *conn, DBusMessage *msg, store_params(adapter, device, &remote); - if (remote.hash && btd_adapter_get_powered(adapter)) + if (remote.hash192 && btd_adapter_get_powered(adapter)) goto read_local; done: free_oob_params(&remote); diff --git a/src/adapter.c b/src/adapter.c index f7faaa263..9cad36da8 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -8770,7 +8770,11 @@ int adapter_set_io_capability(struct btd_adapter *adapter, uint8_t io_cap) int btd_adapter_add_remote_oob_data(struct btd_adapter *adapter, const bdaddr_t *bdaddr, - uint8_t *hash, uint8_t *randomizer) + uint8_t bdaddr_type, + uint8_t *hash192, + uint8_t *randomizer192, + uint8_t *hash256, + uint8_t *randomizer256) { struct mgmt_cp_add_remote_oob_data cp; char addr[18]; @@ -8780,10 +8784,15 @@ int btd_adapter_add_remote_oob_data(struct btd_adapter *adapter, memset(&cp, 0, sizeof(cp)); bacpy(&cp.addr.bdaddr, bdaddr); - memcpy(cp.hash192, hash, 16); - - if (randomizer) - memcpy(cp.rand192, randomizer, 16); + cp.addr.type = bdaddr_type; + if (hash192) + memcpy(cp.hash192, hash192, 16); + if (hash256) + memcpy(cp.hash256, hash256, 16); + if (randomizer192) + memcpy(cp.rand192, randomizer192, 16); + if (randomizer256) + memcpy(cp.rand256, randomizer256, 16); if (mgmt_send(adapter->mgmt, MGMT_OP_ADD_REMOTE_OOB_DATA, adapter->dev_id, sizeof(cp), &cp, diff --git a/src/adapter.h b/src/adapter.h index 688ed51c6..b0a324a78 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -213,8 +213,9 @@ int adapter_set_io_capability(struct btd_adapter *adapter, uint8_t io_cap); int btd_adapter_read_local_oob_data(struct btd_adapter *adapter); int btd_adapter_add_remote_oob_data(struct btd_adapter *adapter, - const bdaddr_t *bdaddr, - uint8_t *hash, uint8_t *randomizer); + const bdaddr_t *bdaddr, uint8_t bdaddr_type, + uint8_t *hash192, uint8_t *randomizer192, + uint8_t *hash256, uint8_t *randomizer256); int btd_adapter_remove_remote_oob_data(struct btd_adapter *adapter, const bdaddr_t *bdaddr); From patchwork Fri Jun 10 22:11:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Brudevold X-Patchwork-Id: 580758 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B7B0C433EF for ; Fri, 10 Jun 2022 22:12:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348985AbiFJWMD (ORCPT ); Fri, 10 Jun 2022 18:12:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348751AbiFJWMD (ORCPT ); Fri, 10 Jun 2022 18:12:03 -0400 Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 808681FD9C3 for ; Fri, 10 Jun 2022 15:12:01 -0700 (PDT) Received: by mail-io1-xd36.google.com with SMTP id a10so409820ioe.9 for ; Fri, 10 Jun 2022 15:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LtseVxzN5o/guOVe4zJxt+CZRQTnRic71Tf67otw8Ho=; b=EhP/klazZqgi1tJgrg811o3eqC77ZXQqWYvY3K/6LjFMz0iBLEbMxnJpc2B+Ijtfd/ C0GQb+vO2BiEuZ0a+salPR/xmWNaiDpdazYwkr5iONCPBxlZO1iZgMMbJuJ8BZtLyJXf krdImU70N3o/Acnz0J71UNPX+z9jwTtKtG3pb5MaVIMvhx4Mw8dsRkr3Io9+b/y/cpwQ AyoyFH0peBEyK3RiU1BsRMBtc/3RQjunZEFXhSUr+KzvbLbit37d0sZ9qaASWAWvfjdw 6jCPTx3ubianxl7SDvz8CuiWVQZkK8CIrV4TYXW43rtg9yFrWqbFa3xcKg2M0zp9/FPp P0yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LtseVxzN5o/guOVe4zJxt+CZRQTnRic71Tf67otw8Ho=; b=q1uqlh/JT4tteUuTuBdAamVvzIlEbaGtIFKwiYk7AqX/tLrQ3Jd8O+cQ0Lek5my44m 476JSKZjhEp7GpzjbESLz/Z+37ZMlcHfVvGH3hISa5U8BAeUdl5TTIxMPydG0OzpvtQs OAy7Fxou856hzT9W19+V07EIN2WA6fy4Eo9oYH0kMylHRI2ZH3FA7f+9hDmSIB+KFu7U uUoa1V0E6PUXwKZywq+bijpioycSSLUrPSXcNcNtx4lspJgb4y62ipnwcciPgNhw0Voj h5Ema0wRq3n8GwhFzlyKH57w16xFxKIukGkwZMEs6/KFIK0fZQRpq50W4r8e5aT0pSSk acHg== X-Gm-Message-State: AOAM533n0YQt7SDAV84reArxDOzJttWfmG1x1KWt/N+DXR3BqFkrd/dH wH3hkuY4EqCp2eohJmOLnnzax0PpR7I= X-Google-Smtp-Source: ABdhPJypWCYpjt/CcLGJ9GQpo6HzF7D5MNQr4/mf3KH/pjILGAo6u2OxZ9uN/guw2lUP+7KUhULU7Q== X-Received: by 2002:a05:6638:16ce:b0:332:44e:af98 with SMTP id g14-20020a05663816ce00b00332044eaf98mr5286705jat.112.1654899120477; Fri, 10 Jun 2022 15:12:00 -0700 (PDT) Received: from localhost.localdomain (c-68-47-51-143.hsd1.mn.comcast.net. [68.47.51.143]) by smtp.gmail.com with ESMTPSA id k5-20020a026605000000b0032b3a7817b3sm117544jac.119.2022.06.10.15.11.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jun 2022 15:11:59 -0700 (PDT) From: Michael Brudevold To: linux-bluetooth@vger.kernel.org Cc: Michael Brudevold Subject: [PATCH v2 3/3] neard: Update D-Bus path and interface Date: Fri, 10 Jun 2022 17:11:24 -0500 Message-Id: <20220610221124.18591-4-puffy.taco@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220610221124.18591-1-puffy.taco@gmail.com> References: <20220610221124.18591-1-puffy.taco@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Michael Brudevold neard has been carrying legacy interfaces since 2013 --- plugins/neard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/neard.c b/plugins/neard.c index e03f981e0..77a4630da 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -33,8 +33,8 @@ #include "src/shared/util.h" #define NEARD_NAME "org.neard" -#define NEARD_PATH "/" -#define NEARD_MANAGER_INTERFACE "org.neard.Manager" +#define NEARD_PATH "/org/neard" +#define NEARD_MANAGER_INTERFACE "org.neard.AgentManager" #define AGENT_INTERFACE "org.neard.HandoverAgent" #define AGENT_PATH "/org/bluez/neard_handover_agent" #define AGENT_CARRIER_TYPE "bluetooth"