[PATCH BlueZ 0/2] fix build error with --enable-hid and --enable-hog options

[PATCH BlueZ 0/2] fix build error with --enable-hid and --enable-hog options

[Thomas Perale]

This patch series fixes build failures when --enable-hid and --enable-hog
are not enabled together. The issue is documented in the following ticket:

https://github.com/bluez/bluez/issues/1228.

Compiling with the --enable-hid --disable-hog option would give an
error because the HID plugin relied on functions defined in the HoG
plugin:

```
> ./configure --enable-hid --disable-hog
...
> make
...
  CCLD     src/bluetoothd
/usr/bin/ld: profiles/input/bluetoothd-manager.o: in function `input_init':
/home/../bluez/profiles/input/manager.c:122:(.text.input_init+0x1c8): undefined reference to `input_set_auto_sec'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:6376: src/bluetoothd] Error 1
```

Compiling with the --disable-hid --enable-hog option would give an
error because the HID plugin relied on functions defined in the HoG
plugin:

```
> ./configure --disable-hid --enable-hog
> make
...
/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect':
/home/../bluez-5.79/profiles/input/hog.c:211:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid'
collect2: error: ld returned 1 exit status
```

This patch series follows the indication gave by Vudentz to make both
plugins independents of each other.

Thomas Perale (2):
  input: fix HID compilation w/o HoG
  input: fix HoG compilation w/o HID

 configure.ac            |  3 +++
 profiles/input/device.c | 11 +++++++++++
 profiles/input/device.h |  1 +
 profiles/input/hog.c    | 19 +++++++++++--------
 4 files changed, 26 insertions(+), 8 deletions(-)

-- 
2.49.0

[PATCH BlueZ 1/2] input: fix HID compilation w/o HoG

[Thomas Perale]

Commit [1] introduced a dependency with the HID plugin in the HoG code
As a result, building with --enable-hid --disable-hog caused linker
errors due to undefined references to HoG-related functions:

```
> ./configure --enable-hid --disable-hog
...
> make
...
  CCLD     src/bluetoothd
/usr/bin/ld: profiles/input/bluetoothd-manager.o: in function `input_init':
/home/../bluez/profiles/input/manager.c:122:(.text.input_init+0x1c8): undefined reference to `input_set_auto_sec'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:6376: src/bluetoothd] Error 1
```

This patch moves the `input_set_auto_sec` function to
`profiles/input/device.c` file so it remains defined even when HoG is
disabled.

[1] f2778f587 input: Add LEAutoSecurity setting to input.conf
---
 profiles/input/device.c | 11 +++++++++++
 profiles/input/device.h |  1 +
 profiles/input/hog.c    |  8 +-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/profiles/input/device.c b/profiles/input/device.c
index a7bc4d44f..d27cfccee 100644
--- a/profiles/input/device.c
+++ b/profiles/input/device.c
@@ -92,6 +92,7 @@ struct input_device {
 static int idle_timeout = 0;
 static uhid_state_t uhid_state = UHID_ENABLED;
 static bool classic_bonded_only = true;
+static bool auto_sec = true;
 
 void input_set_idle_timeout(int timeout)
 {
@@ -127,6 +128,16 @@ bool input_get_classic_bonded_only(void)
 	return classic_bonded_only;
 }
 
+void input_set_auto_sec(bool state)
+{
+	auto_sec = state;
+}
+
+bool input_get_auto_sec(void)
+{
+	return auto_sec;
+}
+
 static void input_device_enter_reconnect_mode(struct input_device *idev);
 static int connection_disconnect(struct input_device *idev, uint32_t flags);
 
diff --git a/profiles/input/device.h b/profiles/input/device.h
index 7b87ce590..9d31fdc51 100644
--- a/profiles/input/device.h
+++ b/profiles/input/device.h
@@ -26,6 +26,7 @@ uint8_t input_get_userspace_hid(void);
 void input_set_classic_bonded_only(bool state);
 bool input_get_classic_bonded_only(void);
 void input_set_auto_sec(bool state);
+bool input_get_auto_sec(void);
 
 int input_device_register(struct btd_service *service);
 void input_device_unregister(struct btd_service *service);
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index 017e320f0..97224f0d1 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -54,14 +54,8 @@ struct hog_device {
 };
 
 static gboolean suspend_supported = FALSE;
-static bool auto_sec = true;
 static struct queue *devices = NULL;
 
-void input_set_auto_sec(bool state)
-{
-	auto_sec = state;
-}
-
 static void hog_device_accept(struct hog_device *dev, struct gatt_db *db)
 {
 	char name[248];
@@ -187,7 +181,7 @@ static int hog_accept(struct btd_service *service)
 	if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
 		struct bt_gatt_client *client;
 
-		if (!auto_sec)
+		if (!input_get_auto_sec())
 			return -ECONNREFUSED;
 
 		client = btd_device_get_gatt_client(device);
-- 
2.49.0

[PATCH BlueZ 2/2] input: fix HoG compilation w/o HID

[Thomas Perale]

Commit [1] introduced a dependency with the HID plugin in the HoG code
As a result, building with --disable-hid --enable-hog caused linker
errors due to undefined references to HID-related functions:

```
> ./configure --disable-hid --enable-hog
> make
/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_accept':
/home/../bluez/profiles/input/hog.c:184:(.text.hog_accept+0xbb): undefined reference to `input_get_auto_sec'
/usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect':
/home/../bluez/profiles/input/hog.c:205:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:6344: src/bluetoothd] Error 1
make: *** [Makefile:4695: all] Error 2
```

This patch introduces the HAVE_HID symbol to conditionally call the
HID-related code in the HoG plugin only when HID is enabled.

Additionally, hog_disconnect() reverts to its pre-[1] behavior when
the HID plugin is unavailable.

[1] 1782bfd79 input: Add support for UserspaceHID=persist

Fixes: https://github.com/bluez/bluez/issues/1228
---
 configure.ac         |  3 +++
 profiles/input/hog.c | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 1e089aaa7..aa56b7b81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,6 +194,9 @@ AM_CONDITIONAL(NETWORK, test "${enable_network}" != "no")
 AC_ARG_ENABLE(hid, AS_HELP_STRING([--disable-hid],
 		[disable HID profile]), [enable_hid=${enableval}])
 AM_CONDITIONAL(HID, test "${enable_hid}" != "no")
+if test "${enable_hid}" != "no"; then
+	AC_DEFINE(HAVE_HID, 1, [Define to 1 if you have HID support.])
+fi
 
 AC_ARG_ENABLE(hog, AS_HELP_STRING([--disable-hog],
 		[disable HoG profile]), [enable_hog=${enableval}])
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index 97224f0d1..7ad94c474 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -40,13 +40,16 @@
 #include "src/shared/gatt-client.h"
 #include "src/plugin.h"
 
-#include "device.h"
 #include "suspend.h"
 #include "attrib/att.h"
 #include "attrib/gattrib.h"
 #include "attrib/gatt.h"
 #include "hog-lib.h"
 
+#ifdef HAVE_HID
+#include "device.h"
+#endif /* HAVE_HID */
+
 struct hog_device {
 	struct btd_device	*device;
 	struct bt_hog		*hog;
@@ -181,8 +184,10 @@ static int hog_accept(struct btd_service *service)
 	if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
 		struct bt_gatt_client *client;
 
+#ifdef HAVE_HID
 		if (!input_get_auto_sec())
 			return -ECONNREFUSED;
+#endif /* HAVE_HID */
 
 		client = btd_device_get_gatt_client(device);
 		if (!bt_gatt_client_set_security(client,
@@ -202,10 +207,14 @@ static int hog_disconnect(struct btd_service *service)
 {
 	struct hog_device *dev = btd_service_get_user_data(service);
 
+#ifdef HAVE_HID
 	if (input_get_userspace_hid() == UHID_PERSIST)
 		bt_hog_detach(dev->hog, false);
 	else
 		bt_hog_detach(dev->hog, true);
+#else
+	bt_hog_detach(dev->hog, false);
+#endif /* HAVE_HID */
 
 	btd_service_disconnecting_complete(service, 0);
 
-- 
2.49.0

Re: [PATCH BlueZ 2/2] input: fix HoG compilation w/o HID

[Luiz Augusto von Dentz]

Hi Thomas,

On Wed, Apr 30, 2025 at 10:42 AM Thomas Perale <thomas.perale@mind.be> wrote:
>
> Commit [1] introduced a dependency with the HID plugin in the HoG code
> As a result, building with --disable-hid --enable-hog caused linker
> errors due to undefined references to HID-related functions:
>
> ```
> > ./configure --disable-hid --enable-hog
> > make
> /usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_accept':
> /home/../bluez/profiles/input/hog.c:184:(.text.hog_accept+0xbb): undefined reference to `input_get_auto_sec'
> /usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect':
> /home/../bluez/profiles/input/hog.c:205:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid'
> collect2: error: ld returned 1 exit status
> make[1]: *** [Makefile:6344: src/bluetoothd] Error 1
> make: *** [Makefile:4695: all] Error 2
> ```
>
> This patch introduces the HAVE_HID symbol to conditionally call the
> HID-related code in the HoG plugin only when HID is enabled.
>
> Additionally, hog_disconnect() reverts to its pre-[1] behavior when
> the HID plugin is unavailable.
>
> [1] 1782bfd79 input: Add support for UserspaceHID=persist
>
> Fixes: https://github.com/bluez/bluez/issues/1228
> ---
>  configure.ac         |  3 +++
>  profiles/input/hog.c | 11 ++++++++++-
>  2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index 1e089aaa7..aa56b7b81 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -194,6 +194,9 @@ AM_CONDITIONAL(NETWORK, test "${enable_network}" != "no")
>  AC_ARG_ENABLE(hid, AS_HELP_STRING([--disable-hid],
>                 [disable HID profile]), [enable_hid=${enableval}])
>  AM_CONDITIONAL(HID, test "${enable_hid}" != "no")
> +if test "${enable_hid}" != "no"; then
> +       AC_DEFINE(HAVE_HID, 1, [Define to 1 if you have HID support.])
> +fi
>
>  AC_ARG_ENABLE(hog, AS_HELP_STRING([--disable-hog],
>                 [disable HoG profile]), [enable_hog=${enableval}])
> diff --git a/profiles/input/hog.c b/profiles/input/hog.c
> index 97224f0d1..7ad94c474 100644
> --- a/profiles/input/hog.c
> +++ b/profiles/input/hog.c
> @@ -40,13 +40,16 @@
>  #include "src/shared/gatt-client.h"
>  #include "src/plugin.h"
>
> -#include "device.h"
>  #include "suspend.h"
>  #include "attrib/att.h"
>  #include "attrib/gattrib.h"
>  #include "attrib/gatt.h"
>  #include "hog-lib.h"
>
> +#ifdef HAVE_HID
> +#include "device.h"
> +#endif /* HAVE_HID */
> +
>  struct hog_device {
>         struct btd_device       *device;
>         struct bt_hog           *hog;
> @@ -181,8 +184,10 @@ static int hog_accept(struct btd_service *service)
>         if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
>                 struct bt_gatt_client *client;
>
> +#ifdef HAVE_HID
>                 if (!input_get_auto_sec())
>                         return -ECONNREFUSED;
> +#endif /* HAVE_HID */

This doesn't look correct, the input.conf is used to configure both
HID and HOG, so why do you think it is a good idea to ignore it if HID
has been disabled? What we probably should do is to move the portion
of input_init that are HOG specific, e.g. LEAutoSecurity, which is
what is being used above.

>                 client = btd_device_get_gatt_client(device);
>                 if (!bt_gatt_client_set_security(client,
> @@ -202,10 +207,14 @@ static int hog_disconnect(struct btd_service *service)
>  {
>         struct hog_device *dev = btd_service_get_user_data(service);
>
> +#ifdef HAVE_HID
>         if (input_get_userspace_hid() == UHID_PERSIST)
>                 bt_hog_detach(dev->hog, false);
>         else
>                 bt_hog_detach(dev->hog, true);
> +#else
> +       bt_hog_detach(dev->hog, false);
> +#endif /* HAVE_HID */

This part we will probably have to duplicate the parsing of
UserspaceHID from input_init.

>         btd_service_disconnecting_complete(service, 0);
>
> --
> 2.49.0
>
>


-- 
Luiz Augusto von Dentz

RE: fix build error with --enable-hid and --enable-hog options

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=958549

---Test result---

Test Summary:
CheckPatch                    PENDING   0.28 seconds
GitLint                       PENDING   0.31 seconds
BuildEll                      PASS      20.71 seconds
BluezMake                     PASS      2747.95 seconds
MakeCheck                     PASS      20.77 seconds
MakeDistcheck                 PASS      202.64 seconds
CheckValgrind                 PASS      281.15 seconds
CheckSmatch                   PASS      310.47 seconds
bluezmakeextell               PASS      130.71 seconds
IncrementalBuild              PENDING   0.24 seconds
ScanBuild                     PASS      927.24 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ 2/2] input: fix HoG compilation w/o HID

[Thomas Perale]

Hi Luiz,

Thanks for your review

> This doesn't look correct, the input.conf is used to configure both
> HID and HOG, so why do you think it is a good idea to ignore it if HID
> has been disabled? What we probably should do is to move the portion
> of input_init that are HOG specific, e.g. LEAutoSecurity, which is
> what is being used above.
> This part we will probably have to duplicate the parsing of
> UserspaceHID from input_init.
My reasoning was that since I didn't saw the 'input.conf' file being 
read in the hog_init I thought it was for a reason. While for the 
'LEAutoSecurity' option it's indeed probably better to encapsulate the 
functions only in the HOG file. For the 'UserspaceHID' option as you 
said, reading the option will need to be duplicated in both input_init 
and hog_init. If this is OK for you to read this option two times then I 
can send a v2 of my patch.

Thomas

On 4/30/25 5:20 PM, Luiz Augusto von Dentz wrote:
> Hi Thomas,
>
> On Wed, Apr 30, 2025 at 10:42 AM Thomas Perale <thomas.perale@mind.be> wrote:
>> Commit [1] introduced a dependency with the HID plugin in the HoG code
>> As a result, building with --disable-hid --enable-hog caused linker
>> errors due to undefined references to HID-related functions:
>>
>> ```
>>> ./configure --disable-hid --enable-hog
>>> make
>> /usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_accept':
>> /home/../bluez/profiles/input/hog.c:184:(.text.hog_accept+0xbb): undefined reference to `input_get_auto_sec'
>> /usr/bin/ld: profiles/input/bluetoothd-hog.o: in function `hog_disconnect':
>> /home/../bluez/profiles/input/hog.c:205:(.text.hog_disconnect+0x12): undefined reference to `input_get_userspace_hid'
>> collect2: error: ld returned 1 exit status
>> make[1]: *** [Makefile:6344: src/bluetoothd] Error 1
>> make: *** [Makefile:4695: all] Error 2
>> ```
>>
>> This patch introduces the HAVE_HID symbol to conditionally call the
>> HID-related code in the HoG plugin only when HID is enabled.
>>
>> Additionally, hog_disconnect() reverts to its pre-[1] behavior when
>> the HID plugin is unavailable.
>>
>> [1] 1782bfd79 input: Add support for UserspaceHID=persist
>>
>> Fixes: https://github.com/bluez/bluez/issues/1228
>> ---
>>   configure.ac         |  3 +++
>>   profiles/input/hog.c | 11 ++++++++++-
>>   2 files changed, 13 insertions(+), 1 deletion(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 1e089aaa7..aa56b7b81 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -194,6 +194,9 @@ AM_CONDITIONAL(NETWORK, test "${enable_network}" != "no")
>>   AC_ARG_ENABLE(hid, AS_HELP_STRING([--disable-hid],
>>                  [disable HID profile]), [enable_hid=${enableval}])
>>   AM_CONDITIONAL(HID, test "${enable_hid}" != "no")
>> +if test "${enable_hid}" != "no"; then
>> +       AC_DEFINE(HAVE_HID, 1, [Define to 1 if you have HID support.])
>> +fi
>>
>>   AC_ARG_ENABLE(hog, AS_HELP_STRING([--disable-hog],
>>                  [disable HoG profile]), [enable_hog=${enableval}])
>> diff --git a/profiles/input/hog.c b/profiles/input/hog.c
>> index 97224f0d1..7ad94c474 100644
>> --- a/profiles/input/hog.c
>> +++ b/profiles/input/hog.c
>> @@ -40,13 +40,16 @@
>>   #include "src/shared/gatt-client.h"
>>   #include "src/plugin.h"
>>
>> -#include "device.h"
>>   #include "suspend.h"
>>   #include "attrib/att.h"
>>   #include "attrib/gattrib.h"
>>   #include "attrib/gatt.h"
>>   #include "hog-lib.h"
>>
>> +#ifdef HAVE_HID
>> +#include "device.h"
>> +#endif /* HAVE_HID */
>> +
>>   struct hog_device {
>>          struct btd_device       *device;
>>          struct bt_hog           *hog;
>> @@ -181,8 +184,10 @@ static int hog_accept(struct btd_service *service)
>>          if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
>>                  struct bt_gatt_client *client;
>>
>> +#ifdef HAVE_HID
>>                  if (!input_get_auto_sec())
>>                          return -ECONNREFUSED;
>> +#endif /* HAVE_HID */
> This doesn't look correct, the input.conf is used to configure both
> HID and HOG, so why do you think it is a good idea to ignore it if HID
> has been disabled? What we probably should do is to move the portion
> of input_init that are HOG specific, e.g. LEAutoSecurity, which is
> what is being used above.
>
>>                  client = btd_device_get_gatt_client(device);
>>                  if (!bt_gatt_client_set_security(client,
>> @@ -202,10 +207,14 @@ static int hog_disconnect(struct btd_service *service)
>>   {
>>          struct hog_device *dev = btd_service_get_user_data(service);
>>
>> +#ifdef HAVE_HID
>>          if (input_get_userspace_hid() == UHID_PERSIST)
>>                  bt_hog_detach(dev->hog, false);
>>          else
>>                  bt_hog_detach(dev->hog, true);
>> +#else
>> +       bt_hog_detach(dev->hog, false);
>> +#endif /* HAVE_HID */
> This part we will probably have to duplicate the parsing of
> UserspaceHID from input_init.
>
>>          btd_service_disconnecting_complete(service, 0);
>>
>> --
>> 2.49.0
>>
>>
>

RE: fix build error with --enable-hid and --enable-hog options

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=958828

---Test result---

Test Summary:
CheckPatch                    PENDING   0.27 seconds
GitLint                       PENDING   0.24 seconds
BuildEll                      PASS      20.39 seconds
BluezMake                     PASS      2592.88 seconds
MakeCheck                     PASS      20.49 seconds
MakeDistcheck                 PASS      198.00 seconds
CheckValgrind                 PASS      275.56 seconds
CheckSmatch                   PASS      301.80 seconds
bluezmakeextell               PASS      128.72 seconds
IncrementalBuild              PENDING   0.24 seconds
ScanBuild                     PASS      909.76 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth