Message ID | 20241029151647.1282872-1-hadess@hadess.net |
---|---|
State | New |
Headers | show |
Series | [BlueZ] device: Better "Connect" debug | expand |
On Tue, 2024-10-29 at 11:36 -0400, Luiz Augusto von Dentz wrote: > Hi Bastien, > > On Tue, Oct 29, 2024 at 11:17 AM Bastien Nocera <hadess@hadess.net> > wrote: > > > > Output clearer debug information so that it's possible to follow > > the > > decisions made by the bluetoothd daemon when a client such as > > bluetoothctl or the GNOME Bluetooth settings ask it to connect to a > > device. > > --- > > src/device.c | 39 ++++++++++++++++++++++++++++++++------- > > 1 file changed, 32 insertions(+), 7 deletions(-) > > > > diff --git a/src/device.c b/src/device.c > > index 7585184de50c..8756aef41aab 100644 > > --- a/src/device.c > > +++ b/src/device.c > > @@ -2462,10 +2462,13 @@ static DBusMessage *connect_profiles(struct > > btd_device *dev, uint8_t bdaddr_type > > DBG("%s %s, client %s", dev->path, uuid ? uuid : "(all)", > > > > dbus_message_get_sender(msg)); > > > > - if (dev->pending || dev->connect || dev->browse) > > + if (dev->pending || dev->connect || dev->browse) { > > + DBG("Cannot connect, connection busy"); > > return btd_error_in_progress_str(msg, > > ERR_BREDR_CONN_BUSY); > > I think for this type of debug we are better off introducing directly > into our gdbus lib so we get the information of both method calls and > replies when debug is enabled, thoughts? I don't really mind leaving the debug messages that are already associated with a return value out of the patch. What did you have in mind for modifying gdbus? Stashing debug messages in the reply? > > > + } > > > > if (!btd_adapter_get_powered(dev->adapter)) { > > + DBG("Cannot connect, adapter is not powered"); > > return btd_error_not_ready_str(msg, > > > > ERR_BREDR_CONN_ADAPTER_NOT_POWERED); > > } > > @@ -2482,8 +2485,10 @@ static DBusMessage *connect_profiles(struct > > btd_device *dev, uint8_t bdaddr_type > > "Connect") > > && > > find_service_with_state(dev- > > >services, > > > > BTD_SERVICE_STATE_CONNECTED)) { > > + DBG("Already connected to > > services"); > > return > > dbus_message_new_method_return(msg); > > } else { > > + DBG("Exhausted the list of BR/EDR > > profiles to connect to"); > > return > > btd_error_not_available_str(msg, > > > > ERR_BREDR_CONN_PROFILE_UNAVAILABLE); > > } > > @@ -2494,8 +2499,10 @@ static DBusMessage *connect_profiles(struct > > btd_device *dev, uint8_t bdaddr_type > > > > err = connect_next(dev); > > if (err < 0) { > > - if (err == -EALREADY) > > + if (err == -EALREADY) { > > + DBG("Already connected"); > > return dbus_message_new_method_return(msg); > > + } > > return btd_error_failed(msg, > > > > btd_error_bredr_conn_from_errno(err)); > > } > > @@ -2568,12 +2575,20 @@ static uint8_t select_conn_bearer(struct > > btd_device *dev) > > return dev->bdaddr_type; > > } > > > > +static const char *bdaddr_type_strs[] = { > > + "BR/EDR", > > + "LE public", > > + "LE random" > > +}; > > + > > static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage > > *msg, > > void > > *user_data) > > { > > struct btd_device *dev = user_data; > > uint8_t bdaddr_type; > > > > + DBG("Calling \"Connect\" for device %s", dev->path); > > + > > if (dev->bredr_state.connected) { > > /* > > * Check if services have been resolved and there > > is at least > > @@ -2581,20 +2596,30 @@ static DBusMessage > > *dev_connect(DBusConnection *conn, DBusMessage *msg, > > */ > > if (dev->bredr_state.svc_resolved && > > find_service_with_state(dev->services, > > - > > BTD_SERVICE_STATE_CONNECTED)) > > + > > BTD_SERVICE_STATE_CONNECTED)) { > > bdaddr_type = dev->bdaddr_type; > > - else > > + DBG("Selecting address type %s, as BR/EDR > > services are resolved " > > + " and connected", bdaddr_type_strs[dev- > > >bdaddr_type]); > > + } else { > > bdaddr_type = BDADDR_BREDR; > > - } else if (dev->le_state.connected && dev->bredr) > > + DBG("Selecting address type BR/EDR, as > > services not resolved " > > + "or not connected"); > > + } > > + } else if (dev->le_state.connected && dev->bredr) { > > bdaddr_type = BDADDR_BREDR; > > - else > > + DBG("Selecting address type BR/EDR, as LE already > > connected"); > > + } else { > > bdaddr_type = select_conn_bearer(dev); > > + DBG("Selecting address type %s", > > bdaddr_type_strs[dev->bdaddr_type]); > > + } > > > > if (bdaddr_type != BDADDR_BREDR) { > > int err; > > > > - if (dev->le_state.connected) > > + if (dev->le_state.connected) { > > + DBG("Device already connected through LE"); > > return dbus_message_new_method_return(msg); > > + } > > > > btd_device_set_temporary(dev, false); > > > > -- > > 2.47.0 > > > > > >
Hi Bastien, On Tue, Oct 29, 2024 at 12:03 PM Bastien Nocera <hadess@hadess.net> wrote: > > On Tue, 2024-10-29 at 11:36 -0400, Luiz Augusto von Dentz wrote: > > Hi Bastien, > > > > On Tue, Oct 29, 2024 at 11:17 AM Bastien Nocera <hadess@hadess.net> > > wrote: > > > > > > Output clearer debug information so that it's possible to follow > > > the > > > decisions made by the bluetoothd daemon when a client such as > > > bluetoothctl or the GNOME Bluetooth settings ask it to connect to a > > > device. > > > --- > > > src/device.c | 39 ++++++++++++++++++++++++++++++++------- > > > 1 file changed, 32 insertions(+), 7 deletions(-) > > > > > > diff --git a/src/device.c b/src/device.c > > > index 7585184de50c..8756aef41aab 100644 > > > --- a/src/device.c > > > +++ b/src/device.c > > > @@ -2462,10 +2462,13 @@ static DBusMessage *connect_profiles(struct > > > btd_device *dev, uint8_t bdaddr_type > > > DBG("%s %s, client %s", dev->path, uuid ? uuid : "(all)", > > > > > > dbus_message_get_sender(msg)); > > > > > > - if (dev->pending || dev->connect || dev->browse) > > > + if (dev->pending || dev->connect || dev->browse) { > > > + DBG("Cannot connect, connection busy"); > > > return btd_error_in_progress_str(msg, > > > ERR_BREDR_CONN_BUSY); > > > > I think for this type of debug we are better off introducing directly > > into our gdbus lib so we get the information of both method calls and > > replies when debug is enabled, thoughts? > > I don't really mind leaving the debug messages that are already > associated with a return value out of the patch. Let's do that then, so we don't pollute the source with more debug messages that would be removed later. > What did you have in mind for modifying gdbus? Stashing debug messages > in the reply? There is already a message as part of the reply in case of error so we would just print it on reply. > > > > > + } > > > > > > if (!btd_adapter_get_powered(dev->adapter)) { > > > + DBG("Cannot connect, adapter is not powered"); > > > return btd_error_not_ready_str(msg, > > > > > > ERR_BREDR_CONN_ADAPTER_NOT_POWERED); > > > } > > > @@ -2482,8 +2485,10 @@ static DBusMessage *connect_profiles(struct > > > btd_device *dev, uint8_t bdaddr_type > > > "Connect") > > > && > > > find_service_with_state(dev- > > > >services, > > > > > > BTD_SERVICE_STATE_CONNECTED)) { > > > + DBG("Already connected to > > > services"); > > > return > > > dbus_message_new_method_return(msg); > > > } else { > > > + DBG("Exhausted the list of BR/EDR > > > profiles to connect to"); > > > return > > > btd_error_not_available_str(msg, > > > > > > ERR_BREDR_CONN_PROFILE_UNAVAILABLE); > > > } > > > @@ -2494,8 +2499,10 @@ static DBusMessage *connect_profiles(struct > > > btd_device *dev, uint8_t bdaddr_type > > > > > > err = connect_next(dev); > > > if (err < 0) { > > > - if (err == -EALREADY) > > > + if (err == -EALREADY) { > > > + DBG("Already connected"); > > > return dbus_message_new_method_return(msg); > > > + } > > > return btd_error_failed(msg, > > > > > > btd_error_bredr_conn_from_errno(err)); > > > } > > > @@ -2568,12 +2575,20 @@ static uint8_t select_conn_bearer(struct > > > btd_device *dev) > > > return dev->bdaddr_type; > > > } > > > > > > +static const char *bdaddr_type_strs[] = { > > > + "BR/EDR", > > > + "LE public", > > > + "LE random" > > > +}; > > > + > > > static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage > > > *msg, > > > void > > > *user_data) > > > { > > > struct btd_device *dev = user_data; > > > uint8_t bdaddr_type; > > > > > > + DBG("Calling \"Connect\" for device %s", dev->path); > > > + > > > if (dev->bredr_state.connected) { > > > /* > > > * Check if services have been resolved and there > > > is at least > > > @@ -2581,20 +2596,30 @@ static DBusMessage > > > *dev_connect(DBusConnection *conn, DBusMessage *msg, > > > */ > > > if (dev->bredr_state.svc_resolved && > > > find_service_with_state(dev->services, > > > - > > > BTD_SERVICE_STATE_CONNECTED)) > > > + > > > BTD_SERVICE_STATE_CONNECTED)) { > > > bdaddr_type = dev->bdaddr_type; > > > - else > > > + DBG("Selecting address type %s, as BR/EDR > > > services are resolved " > > > + " and connected", bdaddr_type_strs[dev- > > > >bdaddr_type]); > > > + } else { > > > bdaddr_type = BDADDR_BREDR; > > > - } else if (dev->le_state.connected && dev->bredr) > > > + DBG("Selecting address type BR/EDR, as > > > services not resolved " > > > + "or not connected"); > > > + } > > > + } else if (dev->le_state.connected && dev->bredr) { > > > bdaddr_type = BDADDR_BREDR; > > > - else > > > + DBG("Selecting address type BR/EDR, as LE already > > > connected"); > > > + } else { > > > bdaddr_type = select_conn_bearer(dev); > > > + DBG("Selecting address type %s", > > > bdaddr_type_strs[dev->bdaddr_type]); > > > + } > > > > > > if (bdaddr_type != BDADDR_BREDR) { > > > int err; > > > > > > - if (dev->le_state.connected) > > > + if (dev->le_state.connected) { > > > + DBG("Device already connected through LE"); > > > return dbus_message_new_method_return(msg); > > > + } > > > > > > btd_device_set_temporary(dev, false); > > > > > > -- > > > 2.47.0 > > > > > > > > > > >
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=904288 ---Test result--- Test Summary: CheckPatch FAIL 0.72 seconds GitLint PASS 0.35 seconds BuildEll PASS 24.65 seconds BluezMake FAIL 80.80 seconds MakeCheck FAIL 1992.17 seconds MakeDistcheck PASS 179.03 seconds CheckValgrind FAIL 60.18 seconds CheckSmatch FAIL 158.94 seconds bluezmakeextell FAIL 66.74 seconds IncrementalBuild FAIL 1519.46 seconds ScanBuild FAIL 156.73 seconds Details ############################## Test: CheckPatch - FAIL Desc: Run checkpatch.pl script Output: [BlueZ] device: Better "Connect" debug WARNING:LONG_LINE_STRING: line length of 91 exceeds 80 columns #81: FILE: src/device.c:2491: + DBG("Exhausted the list of BR/EDR profiles to connect to"); WARNING:STATIC_CONST_CHAR_ARRAY: static const char * array should probably be static const char * const #101: FILE: src/device.c:2578: +static const char *bdaddr_type_strs[] = { WARNING:LONG_LINE_STRING: line length of 89 exceeds 80 columns #126: FILE: src/device.c:2601: + DBG("Selecting address type %s, as BR/EDR services are resolved " WARNING:LONG_LINE: line length of 82 exceeds 80 columns #127: FILE: src/device.c:2602: + " and connected", bdaddr_type_strs[dev->bdaddr_type]); WARNING:LONG_LINE_STRING: line length of 86 exceeds 80 columns #131: FILE: src/device.c:2605: + DBG("Selecting address type BR/EDR, as services not resolved " WARNING:LONG_LINE: line length of 85 exceeds 80 columns #140: FILE: src/device.c:2613: + DBG("Selecting address type %s", bdaddr_type_strs[dev->bdaddr_type]); /github/workspace/src/src/13855034.patch total: 0 errors, 6 warnings, 90 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. /github/workspace/src/src/13855034.patch has style problems, please review. NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. ############################## Test: BluezMake - FAIL Desc: Build BlueZ Output: tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12725 | int main(int argc, char *argv[]) | ^~~~ profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4691: all] Error 2 ############################## Test: MakeCheck - FAIL Desc: Run Bluez Make Check Output: unit/test-avdtp.c: In function ‘main’: unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 766 | int main(int argc, char *argv[]) | ^~~~ unit/test-avrcp.c: In function ‘main’: unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 989 | int main(int argc, char *argv[]) | ^~~~ profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make: *** [Makefile:12356: check] Error 2 ############################## Test: CheckValgrind - FAIL Desc: Run Bluez Make Check with Valgrind Output: tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12725 | int main(int argc, char *argv[]) | ^~~~ profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:12356: check] Error 2 ############################## Test: CheckSmatch - FAIL Desc: Run smatch tool with source Output: src/shared/crypto.c:271:21: warning: Variable length array is used. src/shared/crypto.c:272:23: warning: Variable length array is used. src/shared/gatt-helpers.c:768:31: warning: Variable length array is used. src/shared/gatt-helpers.c:830:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used. src/shared/gatt-server.c:278:25: warning: Variable length array is used. src/shared/gatt-server.c:618:25: warning: Variable length array is used. src/shared/gatt-server.c:716:25: warning: Variable length array is used. src/shared/bap.c:296:25: warning: array of flexible structures src/shared/bap.c: note: in included file: ./src/shared/ascs.h:88:25: warning: array of flexible structures src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' src/shared/crypto.c:271:21: warning: Variable length array is used. src/shared/crypto.c:272:23: warning: Variable length array is used. src/shared/gatt-helpers.c:768:31: warning: Variable length array is used. src/shared/gatt-helpers.c:830:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1323:31: warning: Variable length array is used. src/shared/gatt-helpers.c:1354:23: warning: Variable length array is used. src/shared/gatt-server.c:278:25: warning: Variable length array is used. src/shared/gatt-server.c:618:25: warning: Variable length array is used. src/shared/gatt-server.c:716:25: warning: Variable length array is used. src/shared/bap.c:296:25: warning: array of flexible structures src/shared/bap.c: note: in included file: ./src/shared/ascs.h:88:25: warning: array of flexible structures src/shared/shell.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' tools/mesh-cfgtest.c:1453:17: warning: unknown escape sequence: '\%' tools/sco-tester.c: note: in included file: ./lib/bluetooth.h:219:15: warning: array of flexible structures ./lib/bluetooth.h:224:31: warning: array of flexible structures tools/bneptest.c:634:39: warning: unknown escape sequence: '\%' tools/seq2bseq.c:57:26: warning: Variable length array is used. tools/obex-client-tool.c: note: in included file (through /usr/include/readline/readline.h): /usr/include/readline/rltypedefs.h:35:23: warning: non-ANSI function declaration of function 'Function' /usr/include/readline/rltypedefs.h:36:25: warning: non-ANSI function declaration of function 'VFunction' /usr/include/readline/rltypedefs.h:37:27: warning: non-ANSI function declaration of function 'CPFunction' /usr/include/readline/rltypedefs.h:38:29: warning: non-ANSI function declaration of function 'CPPFunction' android/avctp.c:505:34: warning: Variable length array is used. android/avctp.c:556:34: warning: Variable length array is used. unit/test-avrcp.c:373:26: warning: Variable length array is used. unit/test-avrcp.c:398:26: warning: Variable length array is used. unit/test-avrcp.c:414:24: warning: Variable length array is used. android/avrcp-lib.c:1085:34: warning: Variable length array is used. android/avrcp-lib.c:1583:34: warning: Variable length array is used. android/avrcp-lib.c:1612:34: warning: Variable length array is used. android/avrcp-lib.c:1638:34: warning: Variable length array is used. profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4691: all] Error 2 ############################## Test: bluezmakeextell - FAIL Desc: Build Bluez with External ELL Output: profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4691: all] Error 2 ############################## Test: IncrementalBuild - FAIL Desc: Incremental build with the patches in the series Output: [BlueZ] device: Better "Connect" debug tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12725:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12725 | int main(int argc, char *argv[]) | ^~~~ unit/test-avdtp.c: In function ‘main’: unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 766 | int main(int argc, char *argv[]) | ^~~~ unit/test-avrcp.c: In function ‘main’: unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 989 | int main(int argc, char *argv[]) | ^~~~ profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4691: all] Error 2 ############################## Test: ScanBuild - FAIL Desc: Run Scan Build Output: src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed gatt_db_unregister(op->client->db, op->db_id); ^~~~~~~~~~ src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed discovery_op_complete(op, false, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1296:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed discover_all(op); ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2145:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2153:8: warning: Use of memory after it is freed discovery_op_ref(op), ^~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3242:2: warning: Use of memory after it is freed complete_write_long_op(req, success, 0, false); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3264:2: warning: Use of memory after it is freed request_unref(req); ^~~~~~~~~~~~~~~~~~ 12 warnings generated. src/shared/gatt-client.c:451:21: warning: Use of memory after it is freed gatt_db_unregister(op->client->db, op->db_id); ^~~~~~~~~~ src/shared/gatt-client.c:696:2: warning: Use of memory after it is freed discovery_op_complete(op, false, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:996:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1102:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1296:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1361:2: warning: Use of memory after it is freed discovery_op_complete(op, success, att_ecode); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1636:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:1641:2: warning: Use of memory after it is freed discover_all(op); ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2145:6: warning: Use of memory after it is freed if (read_db_hash(op)) { ^~~~~~~~~~~~~~~~ src/shared/gatt-client.c:2153:8: warning: Use of memory after it is freed discovery_op_ref(op), ^~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3242:2: warning: Use of memory after it is freed complete_write_long_op(req, success, 0, false); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ src/shared/gatt-client.c:3264:2: warning: Use of memory after it is freed request_unref(req); ^~~~~~~~~~~~~~~~~~ 12 warnings generated. tools/hciattach.c:817:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 10)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:865:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:887:8: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 10)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:909:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:930:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 4)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/hciattach.c:974:7: warning: Although the value stored to 'n' is used in the enclosing expression, the value is never actually read from 'n' if ((n = read_hci_event(fd, resp, 6)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ 6 warnings generated. src/oui.c:50:2: warning: Value stored to 'hwdb' is never read hwdb = udev_hwdb_unref(hwdb); ^ ~~~~~~~~~~~~~~~~~~~~~ src/oui.c:53:2: warning: Value stored to 'udev' is never read udev = udev_unref(udev); ^ ~~~~~~~~~~~~~~~~ 2 warnings generated. tools/hcidump.c:180:9: warning: Potential leak of memory pointed to by 'dp' if (fds[i].fd == sock) ^~~ tools/hcidump.c:248:17: warning: Assigned value is garbage or undefined dh->ts_sec = htobl(frm.ts.tv_sec); ^ ~~~~~~~~~~~~~~~~~~~~ tools/hcidump.c:326:9: warning: 1st function call argument is an uninitialized value if (be32toh(dp.flags) & 0x02) { ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:341:20: warning: 1st function call argument is an uninitialized value frm.data_len = be32toh(dp.len); ^~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:346:14: warning: 1st function call argument is an uninitialized value opcode = be32toh(dp.flags) & 0xffff; ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:384:17: warning: Assigned value is garbage or undefined frm.data_len = btohs(dh.len); ^ ~~~~~~~~~~~~~ tools/hcidump.c:394:11: warning: Assigned value is garbage or undefined frm.len = frm.data_len; ^ ~~~~~~~~~~~~ tools/hcidump.c:398:9: warning: 1st function call argument is an uninitialized value ts = be64toh(ph.ts); ^~~~~~~~~~~~~~ /usr/include/endian.h:51:22: note: expanded from macro 'be64toh' # define be64toh(x) __bswap_64 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:403:13: warning: 1st function call argument is an uninitialized value frm.in = be32toh(dp.flags) & 0x01; ^~~~~~~~~~~~~~~~~ /usr/include/endian.h:46:22: note: expanded from macro 'be32toh' # define be32toh(x) __bswap_32 (x) ^~~~~~~~~~~~~~ tools/hcidump.c:408:11: warning: Assigned value is garbage or undefined frm.in = dh.in; ^ ~~~~~ tools/hcidump.c:437:7: warning: Null pointer passed to 1st parameter expecting 'nonnull' fd = open(file, open_flags, 0644); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ 11 warnings generated. tools/rfcomm.c:234:3: warning: Value stored to 'i' is never read i = execvp(cmdargv[0], cmdargv); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:234:7: warning: Null pointer passed to 1st parameter expecting 'nonnull' i = execvp(cmdargv[0], cmdargv); ^~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:354:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd' if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/rfcomm.c:497:14: warning: Assigned value is garbage or undefined req.channel = raddr.rc_channel; ^ ~~~~~~~~~~~~~~~~ tools/rfcomm.c:515:8: warning: Although the value stored to 'fd' is used in the enclosing expression, the value is never actually read from 'fd' if ((fd = open(devname, O_RDONLY | O_NOCTTY)) < 0) { ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 5 warnings generated. src/sdp-xml.c:126:10: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:300:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ src/sdp-xml.c:338:11: warning: Assigned value is garbage or undefined buf[1] = data[i + 1]; ^ ~~~~~~~~~~~ 3 warnings generated. tools/ciptool.c:350:7: warning: 5th function call argument is an uninitialized value sk = do_connect(ctl, dev_id, &src, &dst, psm, (1 << CMTP_LOOPBACK)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. tools/sdptool.c:941:26: warning: Result of 'malloc' is converted to a pointer of type 'uint32_t', which is incompatible with sizeof operand type 'int' uint32_t *value_int = malloc(sizeof(int)); ~~~~~~~~~~ ^~~~~~ ~~~~~~~~~~~ tools/sdptool.c:980:4: warning: 1st function call argument is an uninitialized value free(allocArray[i]); ^~~~~~~~~~~~~~~~~~~ tools/sdptool.c:3777:2: warning: Potential leak of memory pointed to by 'si.name' return add_service(0, &si); ^~~~~~~~~~~~~~~~~~~~~~~~~~ tools/sdptool.c:4112:4: warning: Potential leak of memory pointed to by 'context.svc' return -1; ^~~~~~~~~ 4 warnings generated. tools/avtest.c:225:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:235:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:244:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:258:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:265:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:272:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:279:5: warning: Value stored to 'len' is never read len = write(sk, buf, ^ ~~~~~~~~~~~~~~ tools/avtest.c:291:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:295:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:304:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:308:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:317:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:324:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:346:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:350:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:359:5: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:363:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:376:5: warning: Value stored to 'len' is never read len = write(sk, buf, 4); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:380:5: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:387:4: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:397:4: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:562:3: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:570:3: warning: Value stored to 'len' is never read len = write(sk, buf, invalid ? 2 : 3); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/avtest.c:584:3: warning: Value stored to 'len' is never read len = write(sk, buf, 4 + sizeof(media_transport)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/avtest.c:597:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:607:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:619:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:634:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:646:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:655:3: warning: Value stored to 'len' is never read len = write(sk, buf, 3); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:662:3: warning: Value stored to 'len' is never read len = write(sk, buf, 2); ^ ~~~~~~~~~~~~~~~~~ tools/avtest.c:698:2: warning: Value stored to 'len' is never read len = write(sk, buf, AVCTP_HEADER_LENGTH + sizeof(play_pressed)); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 32 warnings generated. tools/btproxy.c:836:15: warning: Null pointer passed to 1st parameter expecting 'nonnull' tcp_port = atoi(optarg); ^~~~~~~~~~~~ tools/btproxy.c:839:8: warning: Null pointer passed to 1st parameter expecting 'nonnull' if (strlen(optarg) > 3 && !strncmp(optarg, "hci", 3)) ^~~~~~~~~~~~~~ 2 warnings generated. tools/create-image.c:76:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:84:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:92:3: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ tools/create-image.c:105:2: warning: Value stored to 'fd' is never read fd = -1; ^ ~~ 4 warnings generated. tools/btgatt-client.c:1824:2: warning: Value stored to 'argv' is never read argv += optind; ^ ~~~~~~ 1 warning generated. tools/btgatt-server.c:1212:2: warning: Value stored to 'argv' is never read argv -= optind; ^ ~~~~~~ 1 warning generated. tools/check-selftest.c:42:3: warning: Value stored to 'ptr' is never read ptr = fgets(result, sizeof(result), fp); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. tools/gatt-service.c:294:2: warning: 2nd function call argument is an uninitialized value chr_write(chr, value, len); ^~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated. tools/obex-server-tool.c:133:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' data->fd = open(name, O_WRONLY | O_CREAT | O_NOCTTY, 0600); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ tools/obex-server-tool.c:192:13: warning: Null pointer passed to 1st parameter expecting 'nonnull' data->fd = open(name, O_RDONLY | O_NOCTTY, 0); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. tools/btpclientctl.c:402:3: warning: Value stored to 'bit' is never read bit = 0; ^ ~ tools/btpclientctl.c:1655:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull' memcpy(cp->data, ad_data, ad_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 warnings generated. src/sdpd-request.c:211:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint16_t' pElem = malloc(sizeof(uint16_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ src/sdpd-request.c:239:13: warning: Result of 'malloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' pElem = malloc(sizeof(uint32_t)); ^~~~~~ ~~~~~~~~~~~~~~~~ 2 warnings generated. android/avrcp-lib.c:1968:3: warning: 1st function call argument is an uninitialized value g_free(text[i]); ^~~~~~~~~~~~~~~ 1 warning generated. profiles/input/manager.c: In function ‘input_init’: profiles/input/manager.c:102:4: error: implicit declaration of function ‘free’ [-Werror=implicit-function-declaration] 102 | free(uhid_enabled); | ^~~~ profiles/input/manager.c:102:4: error: incompatible implicit declaration of built-in function ‘free’ [-Werror] profiles/input/manager.c:32:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘free’ 31 | #include "server.h" +++ |+#include <stdlib.h> 32 | cc1: all warnings being treated as errors make[1]: *** [Makefile:10403: profiles/input/bluetoothd-manager.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4691: all] Error 2 --- Regards, Linux Bluetooth
diff --git a/src/device.c b/src/device.c index 7585184de50c..8756aef41aab 100644 --- a/src/device.c +++ b/src/device.c @@ -2462,10 +2462,13 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type DBG("%s %s, client %s", dev->path, uuid ? uuid : "(all)", dbus_message_get_sender(msg)); - if (dev->pending || dev->connect || dev->browse) + if (dev->pending || dev->connect || dev->browse) { + DBG("Cannot connect, connection busy"); return btd_error_in_progress_str(msg, ERR_BREDR_CONN_BUSY); + } if (!btd_adapter_get_powered(dev->adapter)) { + DBG("Cannot connect, adapter is not powered"); return btd_error_not_ready_str(msg, ERR_BREDR_CONN_ADAPTER_NOT_POWERED); } @@ -2482,8 +2485,10 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type "Connect") && find_service_with_state(dev->services, BTD_SERVICE_STATE_CONNECTED)) { + DBG("Already connected to services"); return dbus_message_new_method_return(msg); } else { + DBG("Exhausted the list of BR/EDR profiles to connect to"); return btd_error_not_available_str(msg, ERR_BREDR_CONN_PROFILE_UNAVAILABLE); } @@ -2494,8 +2499,10 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type err = connect_next(dev); if (err < 0) { - if (err == -EALREADY) + if (err == -EALREADY) { + DBG("Already connected"); return dbus_message_new_method_return(msg); + } return btd_error_failed(msg, btd_error_bredr_conn_from_errno(err)); } @@ -2568,12 +2575,20 @@ static uint8_t select_conn_bearer(struct btd_device *dev) return dev->bdaddr_type; } +static const char *bdaddr_type_strs[] = { + "BR/EDR", + "LE public", + "LE random" +}; + static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg, void *user_data) { struct btd_device *dev = user_data; uint8_t bdaddr_type; + DBG("Calling \"Connect\" for device %s", dev->path); + if (dev->bredr_state.connected) { /* * Check if services have been resolved and there is at least @@ -2581,20 +2596,30 @@ static DBusMessage *dev_connect(DBusConnection *conn, DBusMessage *msg, */ if (dev->bredr_state.svc_resolved && find_service_with_state(dev->services, - BTD_SERVICE_STATE_CONNECTED)) + BTD_SERVICE_STATE_CONNECTED)) { bdaddr_type = dev->bdaddr_type; - else + DBG("Selecting address type %s, as BR/EDR services are resolved " + " and connected", bdaddr_type_strs[dev->bdaddr_type]); + } else { bdaddr_type = BDADDR_BREDR; - } else if (dev->le_state.connected && dev->bredr) + DBG("Selecting address type BR/EDR, as services not resolved " + "or not connected"); + } + } else if (dev->le_state.connected && dev->bredr) { bdaddr_type = BDADDR_BREDR; - else + DBG("Selecting address type BR/EDR, as LE already connected"); + } else { bdaddr_type = select_conn_bearer(dev); + DBG("Selecting address type %s", bdaddr_type_strs[dev->bdaddr_type]); + } if (bdaddr_type != BDADDR_BREDR) { int err; - if (dev->le_state.connected) + if (dev->le_state.connected) { + DBG("Device already connected through LE"); return dbus_message_new_method_return(msg); + } btd_device_set_temporary(dev, false);