Skip to contentSkip to conversation

advertising: Fix setting discoverable flag only for peripheral

PATCH In review Szymon Janc 2 participants 4 messages Feb 20, 2018 – Feb 21, 2018 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 advertising: Fix setting discoverable flag only for peripheral

General Discoverable mode can also be set for non-connectable advertising. This was affecting GAP/DISC/GENM/BV-03-C qualification testcase.

---
 src/advertising.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
src/advertising.c +3 -4
index 38d2a2d1f..6e227d4d1 100644
@@ -622,12 +622,11 @@ static int refresh_adv(struct btd_adv_client *client, mgmt_request_func_t func)
 
 	DBG("Refreshing advertisement: %s", client->path);
 
-	if (client->type == AD_TYPE_PERIPHERAL) {
+	if (client->type == AD_TYPE_PERIPHERAL)
 		flags = MGMT_ADV_FLAG_CONNECTABLE;
 
-		if (btd_adapter_get_discoverable(client->manager->adapter))
-			flags |= MGMT_ADV_FLAG_DISCOV;
-	}
+	if (btd_adapter_get_discoverable(client->manager->adapter))
+		flags |= MGMT_ADV_FLAG_DISCOV;
 
 	flags |= client->flags;
 
Signature · 1 line
2.14.3
#1 lore raw

Hi Szymon,

Quoted 14 lines · Szymon Janc

General Discoverable mode can also be set for non-connectable advertising. This was affecting GAP/DISC/GENM/BV-03-C qualification testcase.

---
 src/advertising.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
src/advertising.c +0 -0
index 38d2a2d1f..6e227d4d1 100644
@@ -622,12 +622,11 @@ static int refresh_adv(struct btd_adv_client *client, mgmt_request_func_t func)
 
        DBG("Refreshing advertisement: %s", client->path);

src/advertising.c static int refresh_adv(struct btd_adv_client *client, mgmt_request_func_t func) · line 629

Quoted 10 lines
src/advertising.c +3 -4
 
-       if (client->type == AD_TYPE_PERIPHERAL) {
+       if (client->type == AD_TYPE_PERIPHERAL)
                flags = MGMT_ADV_FLAG_CONNECTABLE;
 
-               if (btd_adapter_get_discoverable(client->manager->adapter))
-                       flags |= MGMT_ADV_FLAG_DISCOV;
-       }
+       if (btd_adapter_get_discoverable(client->manager->adapter))
+               flags |= MGMT_ADV_FLAG_DISCOV;

iirc there were something saying that non-connectable advertisement should not set these flags, if I recall this right this was why beacons used to not show on the discovery or something like that.

Signature · 1 line
Luiz Augusto von Dentz
#2 lore raw

Hi Luiz,

Quoted 3 lines · On Tuesday, 20 February 2018 17:21:54 CET Luiz Augusto von Dentz wrote:

Hi Szymon,

On Tue, Feb 20, 2018 at 5:13 PM, Szymon Janc <[email protected]>

Quoted 21 lines · wrote:
Quoted 21 lines

General Discoverable mode can also be set for non-connectable advertising. This was affecting GAP/DISC/GENM/BV-03-C qualification testcase.
---

 src/advertising.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
src/advertising.c +1 -1
index 38d2a2d1f..6e227d4d1 100644
@@ -622,12 +622,11 @@ static int refresh_adv(struct btd_adv_client
 *client, mgmt_request_func_t func)> 
        DBG("Refreshing advertisement: %s", client->path);
 
-       if (client->type == AD_TYPE_PERIPHERAL) {
+       if (client->type == AD_TYPE_PERIPHERAL)
 
                flags = MGMT_ADV_FLAG_CONNECTABLE;
 
Quoted 10 lines

src/advertising.c static int refresh_adv(struct btd_adv_client *client, mgmt_request_func_t func) · line 629

Quoted 6 lines
src/advertising.c +2 -3
-               if
 (btd_adapter_get_discoverable(client->manager->adapter))
-                       flags |= MGMT_ADV_FLAG_DISCOV;
-       }
+       if (btd_adapter_get_discoverable(client->manager->adapter))
+               flags |= MGMT_ADV_FLAG_DISCOV;

iirc there were something saying that non-connectable advertisement should not set these flags, if I recall this right this was why beacons used to not show on the discovery or something like that.

As mentioned in commit there is qualification test which tests it.

GAP/DISC/GENM/BV-03-C
[General Discoverable Mode Non-Connectable Mode - LE Only]

That said, this patch isn't valid since in bluetoothd discoverable requires connectable so currently we are not able to configure non-connectable advertising instance when discoverable.

I think we should extend Add Advertising mgmt command with flag that would allow to force non-connectable advertising regardless of global connectable flag.

Thoughts?

Signature · 2 lines
pozdrawiam
Szymon Janc
#3 lore raw

Hi Szymon,

On Wed, Feb 21, 2018 at 9:59 AM, Szymon Janc <[email protected]> wrot= e:

Quoted 39 lines

Hi Luiz,

Quoted 3 lines · On Tuesday, 20 February 2018 17:21:54 CET Luiz Augusto von Dentz wrote:

Hi Szymon,

On Tue, Feb 20, 2018 at 5:13 PM, Szymon Janc <[email protected]>

Quoted 21 lines · wrote:
Quoted 21 lines

General Discoverable mode can also be set for non-connectable advertising. This was affecting GAP/DISC/GENM/BV-03-C qualification testcase.
---

 src/advertising.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
src/advertising.c +1 -1
index 38d2a2d1f..6e227d4d1 100644
@@ -622,12 +622,11 @@ static int refresh_adv(struct btd_adv_client
 *client, mgmt_request_func_t func)>
        DBG("Refreshing advertisement: %s", client->path);
 
-       if (client->type =3D=3D AD_TYPE_PERIPHERAL) {
+       if (client->type =3D=3D AD_TYPE_PERIPHERAL)
 
                flags =3D MGMT_ADV_FLAG_CONNECTABLE;
 
Quoted 10 lines

src/advertising.c static int refresh_adv(struct btd_adv_client · line 631

Quoted 6 lines
src/advertising.c +2 -3
-               if
 (btd_adapter_get_discoverable(client->manager->adapter))
-                       flags |=3D MGMT_ADV_FLAG_DISCOV;
-       }
+       if (btd_adapter_get_discoverable(client->manager->adapter))
+               flags |=3D MGMT_ADV_FLAG_DISCOV;

iirc there were something saying that non-connectable advertisement should not set these flags, if I recall this right this was why beacons used to not show on the discovery or something like that.

Quoted 6 lines

As mentioned in commit there is qualification test which tests it.

GAP/DISC/GENM/BV-03-C
[General Discoverable Mode Non-Connectable Mode - LE Only]

That said, this patch isn't valid since in bluetoothd discoverable requir=

es

Quoted 4 lines

connectable so currently we are not able to configure non-connectable advertising instance when discoverable.

I think we should extend Add Advertising mgmt command with flag that woul=

d

Quoted 1 line

allow to force non-connectable advertising regardless of global connectab=

le

Quoted 3 lines

flag.

Thoughts?

I guess I was assuming that discoverable would always be connectable aka. Peripheral Mode, since Broadcast Mode shall not set these flags:

'A device in the broadcast mode shall not set the =E2=80=98LE General Disco= verable Mode=E2=80=99
flag or the =E2=80=98LE Limited Discoverable Mode=E2=80=99 flag in the Flag= s AD Type as defined
in [Core Specification Supplement], Part A, Section 1.3.'

Perhaps this test is not really for broadcast mode, but our D-Bus is, so I wonder how we can accommodate this, or perhaps this would go under Peripheral Mode? I really thought the distinction of broadcast vs peripheral would be the use of non-connectable vs connectable advertisements but that doesn't seem to be true for the test above.

--=20
Luiz Augusto von Dentz