From d97351ad73058ad92d0f1dd41ed99a8fe3122655 Mon Sep 17 00:00:00 2001 From: RustDesk <71636191+rustdesk@users.noreply.github.com> Date: Thu, 22 Oct 2026 17:58:00 +0800 Subject: [PATCH] Custom websocket port (#16658) * feat: let custom client settings set websocket-port A domain endpoint becomes ws(s):///ws/id with no port, so a WebSocket reverse proxy that cannot listen on 443 (or 80) is unreachable. hbb_common adds websocket-port for that; list it in KEYS_SETTINGS so default-settings and override-settings carry it. The hbb_common bump also brings in 20d5019 (quiets smithay client toolkit logs, rustdesk/hbb_common#620). https://github.com/rustdesk/rustdesk-server-pro/discussions/1029 Co-Authored-By: Claude Opus 5.5 * Update hbb_common for the websocket-port warning throttle Co-Authored-By: Claude Opus 5.5 * Update hbb_common: match websocket-port only against configured servers Co-Authored-By: Claude Opus 5.5 * Pin hbb_common to the merged websocket-port change rustdesk/hbb_common#626 is merged as edefa08. The range from master's pin 5d52530 also includes 20d5019 (quiets smithay client toolkit logs, rustdesk/hbb_common#620). Co-Authored-By: Claude Opus 5.5 --------- Co-authored-by: Claude Opus 5.5 --- libs/base/src/config/keys.rs | 1 + libs/hbb_common | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/base/src/config/keys.rs b/libs/base/src/config/keys.rs index bc7426aca..000b77f1d 100644 --- a/libs/base/src/config/keys.rs +++ b/libs/base/src/config/keys.rs @@ -311,6 +311,7 @@ pub const KEYS_SETTINGS: &[&str] = &[ OPTION_API_SERVER, OPTION_KEY, OPTION_ALLOW_WEBSOCKET, + OPTION_WEBSOCKET_PORT, OPTION_PRESET_ADDRESS_BOOK_NAME, OPTION_PRESET_ADDRESS_BOOK_TAG, OPTION_PRESET_ADDRESS_BOOK_ALIAS, diff --git a/libs/hbb_common b/libs/hbb_common index 5d52530b6..edefa08b7 160000 --- a/libs/hbb_common +++ b/libs/hbb_common @@ -1 +1 @@ -Subproject commit 5d52530b636fb296a324260b074780cf559e0093 +Subproject commit edefa08b798b7fbf70b274a4cdbf701c9e06f7a3