| Message ID | 20230728053153.584222-2-simon.mikuda@streamunlimited.com |
|---|---|
| State | New |
| Headers | show |
| Series | Device pairing and discovery fixes | expand |
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=770402
---Test result---
Test Summary:
CheckPatch FAIL 2.88 seconds
GitLint PASS 1.55 seconds
BuildEll PASS 33.07 seconds
BluezMake PASS 1196.56 seconds
MakeCheck PASS 12.58 seconds
MakeDistcheck PASS 192.41 seconds
CheckValgrind PASS 304.17 seconds
CheckSmatch PASS 422.49 seconds
bluezmakeextell PASS 127.59 seconds
IncrementalBuild PASS 5054.50 seconds
ScanBuild PASS 1352.14 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,1/5] device: Refactor device_discover_services function
WARNING:LONG_LINE: line length of 86 exceeds 80 columns
#136: FILE: src/device.c:5874:
+ uint8_t bdaddr_type, DBusMessage *msg)
WARNING:LONG_LINE: line length of 87 exceeds 80 columns
#177: FILE: src/device.h:180:
+ uint8_t bdaddr_type, DBusMessage *msg);
/github/workspace/src/src/13331214.patch total: 0 errors, 2 warnings, 71 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/13331214.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.
[BlueZ,3/5] device: Fix returning discovery error for Device.Pair
WARNING:TYPO_SPELLING: 'successfull' may be misspelled - perhaps 'successful'?
#80:
If discovery was requesed from pair request we will report successfull
^^^^^^^^^^^
WARNING:LONG_LINE: line length of 82 exceeds 80 columns
#104: FILE: src/device.c:6355:
+ err = device_discover_services(device, bdaddr_type, bonding->msg);
WARNING:LONG_LINE: line length of 85 exceeds 80 columns
#107: FILE: src/device.c:6358:
+ g_dbus_emit_property_changed(dbus_conn, device->path,
WARNING:LONG_LINE: line length of 86 exceeds 80 columns
#112: FILE: src/device.c:6363:
+ g_dbus_send_reply(dbus_conn, bonding->msg, DBUS_TYPE_INVALID);
/github/workspace/src/src/13331216.patch total: 0 errors, 4 warnings, 25 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/13331216.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.
[BlueZ,4/5] device: Fix pairing with dual mode devices
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#82:
even when we have connection to LE bearer only. In these situation we should
/github/workspace/src/src/13331217.patch total: 0 errors, 1 warnings, 11 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/13331217.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.
[BlueZ,5/5] device: Fix reverse service discovery handling for dual mode devices
WARNING:LONG_LINE_COMMENT: line length of 81 exceeds 80 columns
#185: FILE: src/device.c:2795:
+ * device->state.browse is set and "InProgress" error is returned instead
WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
#349: FILE: src/device.c:6406:
+ * timer */
/github/workspace/src/src/13331218.patch total: 0 errors, 2 warnings, 268 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/13331218.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.
---
Regards,
Linux Bluetooth
diff --git a/profiles/input/server.c b/profiles/input/server.c index 79cf08a66..12912cae6 100644 --- a/profiles/input/server.c +++ b/profiles/input/server.c @@ -102,7 +102,7 @@ static void sixaxis_browse_sdp(const bdaddr_t *src, const bdaddr_t *dst, data->psm = psm; if (psm == L2CAP_PSM_HIDP_CTRL) - device_discover_services(device); + device_discover_services(device, BDADDR_BREDR, NULL); device_wait_for_svc_complete(device, sixaxis_sdp_cb, data); } diff --git a/src/adapter.c b/src/adapter.c index 2679d4302..b77d90c7b 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3637,7 +3637,7 @@ static void device_connect_cb(GIOChannel *io, GError *gerr, gpointer user_data) device_attach_att(device, io); } - device_discover_services(device); + device_discover_services(device, data->dst_type, NULL); device_wait_for_svc_complete(device, device_browse_cb, NULL); g_io_channel_unref(io); diff --git a/src/device.c b/src/device.c index b43ced8b5..82740216d 100644 --- a/src/device.c +++ b/src/device.c @@ -2446,10 +2446,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type resolve_services: DBG("Resolving services for %s", dev->path); - if (bdaddr_type == BDADDR_BREDR) - err = device_browse_sdp(dev, msg); - else - err = device_browse_gatt(dev, msg); + err = device_discover_services(dev, bdaddr_type, msg); if (err < 0) { return btd_error_failed(msg, bdaddr_type == BDADDR_BREDR ? ERR_BREDR_CONN_SDP_SEARCH : ERR_LE_CONN_GATT_BROWSE); @@ -5873,14 +5870,15 @@ static int device_browse_sdp(struct btd_device *device, DBusMessage *msg) return err; } -int device_discover_services(struct btd_device *device) +int device_discover_services(struct btd_device *device, + uint8_t bdaddr_type, DBusMessage *msg) { int err; - if (device->bredr) - err = device_browse_sdp(device, NULL); + if (bdaddr_type == BDADDR_BREDR) + err = device_browse_sdp(device, msg); else - err = device_browse_gatt(device, NULL); + err = device_browse_gatt(device, msg); if (err == 0 && device->discov_timer) { timeout_remove(device->discov_timer); @@ -6353,15 +6351,7 @@ void device_bonding_complete(struct btd_device *device, uint8_t bdaddr_type, DBG("Proceeding with service discovery"); /* If we are initiators remove any discovery timer and just * start discovering services directly */ - if (device->discov_timer) { - timeout_remove(device->discov_timer); - device->discov_timer = 0; - } - - if (bdaddr_type == BDADDR_BREDR) - device_browse_sdp(device, bonding->msg); - else - device_browse_gatt(device, bonding->msg); + device_discover_services(device, bdaddr_type, bonding->msg); bonding_request_free(bonding); } else if (!state->svc_resolved) { diff --git a/src/device.h b/src/device.h index 3252e14ef..0393478df 100644 --- a/src/device.h +++ b/src/device.h @@ -176,7 +176,8 @@ bool device_remove_svc_complete_callback(struct btd_device *dev, struct btd_service *btd_device_get_service(struct btd_device *dev, const char *remote_uuid); -int device_discover_services(struct btd_device *device); +int device_discover_services(struct btd_device *device, + uint8_t bdaddr_type, DBusMessage *msg); int btd_device_connect_services(struct btd_device *dev, GSList *services); uint32_t btd_device_get_current_flags(struct btd_device *dev);