rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2026-08-27 04:37:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into refact/fs-expose-fn-validate-path

Browse Source
This commit is contained in:
fufesou
2026-07-24 10:39:48 +08:00
parent 70949becf6 5438d20225
commit d8b5a2fd3b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protos/rendezvous.proto
+2
View File
@@ -28,6 +28,7 @@ message PunchHoleRequest {
bool force_relay = 8; bool force_relay = 8;
int32 upnp_port = 9; int32 upnp_port = 9;
bytes socket_addr_v6 = 10; bytes socket_addr_v6 = 10;
string switch_code = 11;
} }
message ControlPermissions { message ControlPermissions {
@@ -152,6 +153,7 @@ message RequestRelay {
string token = 8; string token = 8;
ControlPermissions control_permissions = 9; ControlPermissions control_permissions = 9;
ControlledContext controlled_context = 10; ControlledContext controlled_context = 10;
string switch_code = 11;
} }
message RelayResponse { message RelayResponse {
src/config.rs
+2
View File
@@ -2918,6 +2918,7 @@ pub mod keys {
pub const OPTION_DIRECT_SERVER: &str = "direct-server"; pub const OPTION_DIRECT_SERVER: &str = "direct-server";
pub const OPTION_DIRECT_ACCESS_PORT: &str = "direct-access-port"; pub const OPTION_DIRECT_ACCESS_PORT: &str = "direct-access-port";
pub const OPTION_WHITELIST: &str = "whitelist"; pub const OPTION_WHITELIST: &str = "whitelist";
pub const OPTION_ID_WHITELIST: &str = "id-whitelist";
pub const OPTION_ALLOW_AUTO_DISCONNECT: &str = "allow-auto-disconnect"; pub const OPTION_ALLOW_AUTO_DISCONNECT: &str = "allow-auto-disconnect";
pub const OPTION_AUTO_DISCONNECT_TIMEOUT: &str = "auto-disconnect-timeout"; pub const OPTION_AUTO_DISCONNECT_TIMEOUT: &str = "auto-disconnect-timeout";
pub const OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN: &str = "allow-only-conn-window-open"; pub const OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN: &str = "allow-only-conn-window-open";
@@ -3151,6 +3152,7 @@ pub mod keys {
OPTION_DIRECT_SERVER, OPTION_DIRECT_SERVER,
OPTION_DIRECT_ACCESS_PORT, OPTION_DIRECT_ACCESS_PORT,
OPTION_WHITELIST, OPTION_WHITELIST,
OPTION_ID_WHITELIST,
OPTION_ALLOW_AUTO_DISCONNECT, OPTION_ALLOW_AUTO_DISCONNECT,
OPTION_AUTO_DISCONNECT_TIMEOUT, OPTION_AUTO_DISCONNECT_TIMEOUT,
OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN, OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN,