| Message ID | 20241014171058.75235-1-frederic.danis@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b30b1eddb4b3d69968f18c943139f4aa0018d1b3 |
| Headers | show |
| Series | [BlueZ,v2] tools/obexctl: Add support to connect using PSM port | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| tedd_an/CheckPatch | warning | WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '5d7d3ac25bd5', maybe rebased or not pulled? #68: Since commit 5d7d3ac25bd5 ("obexd: Add PSM support to session create") /github/workspace/src/src/13835327.patch total: 0 errors, 1 warnings, 42 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/13835327.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. |
| tedd_an/GitLint | success | Gitlint PASS |
| tedd_an/BuildEll | success | Build ELL PASS |
| tedd_an/BluezMake | success | Bluez Make PASS |
| tedd_an/MakeCheck | success | Bluez Make Check PASS |
| tedd_an/MakeDistcheck | success | Make Distcheck PASS |
| tedd_an/CheckValgrind | success | Check Valgrind PASS |
| tedd_an/CheckSmatch | success | CheckSparse PASS |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/IncrementalBuild | success | Incremental Build PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
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=899000
---Test result---
Test Summary:
CheckPatch FAIL 0.57 seconds
GitLint PASS 0.18 seconds
BuildEll PASS 24.55 seconds
BluezMake PASS 1596.25 seconds
MakeCheck PASS 13.23 seconds
MakeDistcheck PASS 178.98 seconds
CheckValgrind PASS 254.85 seconds
CheckSmatch PASS 357.12 seconds
bluezmakeextell PASS 120.50 seconds
IncrementalBuild PASS 1418.40 seconds
ScanBuild PASS 1019.71 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,v2] tools/obexctl: Add support to connect using PSM port
WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '5d7d3ac25bd5', maybe rebased or not pulled?
#68:
Since commit 5d7d3ac25bd5 ("obexd: Add PSM support to session create")
/github/workspace/src/src/13835327.patch total: 0 errors, 1 warnings, 42 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/13835327.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
Hello: This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Mon, 14 Oct 2024 19:10:58 +0200 you wrote: > Since commit 5d7d3ac25bd5 ("obexd: Add PSM support to session create") > obexd supports to connect the session using a L2CAP PSM. > --- > tools/obexctl.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) Here is the summary with links: - [BlueZ,v2] tools/obexctl: Add support to connect using PSM port https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=b30b1eddb4b3 You are awesome, thank you!
diff --git a/tools/obexctl.c b/tools/obexctl.c index 56a76915c..c3db11b67 100644 --- a/tools/obexctl.c +++ b/tools/obexctl.c @@ -114,7 +114,7 @@ static void connect_reply(DBusMessage *message, void *user_data) struct connect_args { char *dev; char *target; - uint8_t channel; + uint16_t channel; }; static void connect_args_free(void *data) @@ -144,9 +144,14 @@ static void connect_setup(DBusMessageIter *iter, void *user_data) g_dbus_dict_append_entry(&dict, "Target", DBUS_TYPE_STRING, &args->target); - if (args->channel) - g_dbus_dict_append_entry(&dict, "Channel", + if (args->channel) { + if (args->channel > 31) + g_dbus_dict_append_entry(&dict, "PSM", + DBUS_TYPE_UINT16, &args->channel); + else + g_dbus_dict_append_entry(&dict, "Channel", DBUS_TYPE_BYTE, &args->channel); + } dbus_message_iter_close_container(iter, &dict); } @@ -169,8 +174,8 @@ static void cmd_connect(int argc, char *argv[]) char *endptr = NULL; channel = strtol(argv[3], &endptr, 0); - if (!endptr || *endptr != '\0' || channel > UINT8_MAX) { - bt_shell_printf("Invalid channel\n"); + if (!endptr || *endptr != '\0' || channel > UINT16_MAX) { + bt_shell_printf("Invalid channel or PSM\n"); return bt_shell_noninteractive_quit(EXIT_FAILURE); } } @@ -1846,7 +1851,7 @@ static void cmd_mkdir(int argc, char *argv[]) static const struct bt_shell_menu main_menu = { .name = "main", .entries = { - { "connect", "<dev> [uuid] [channel]", cmd_connect, + { "connect", "<dev> [uuid] [channel|PSM]", cmd_connect, "Connect session" }, { "disconnect", "[session]", cmd_disconnect, "Disconnect session", session_generator },
Since commit 5d7d3ac25bd5 ("obexd: Add PSM support to session create") obexd supports to connect the session using a L2CAP PSM. --- tools/obexctl.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)