Merge remote-tracking branch 'rustdesk/master' into flutter_desktop

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	build.rs
#	flutter/.gitignore
#	flutter/lib/common.dart
#	flutter/lib/mobile/pages/remote_page.dart
#	flutter/lib/models/model.dart
#	flutter/lib/models/native_model.dart
#	flutter/lib/models/server_model.dart
#	flutter/pubspec.lock
#	flutter/pubspec.yaml
#	src/client.rs
#	src/client/file_trait.rs
#	src/flutter.rs
#	src/mobile_ffi.rs
#	src/ui.rs

libs/hbb_common/protos/message.proto

@@ -65,6 +65,10 @@ message LoginRequest {
 
 message ChatMessage { string text = 1; }
 
+message Features {
+  bool privacy_mode = 1;
+}
+
 message PeerInfo {
   string username = 1;
   string hostname = 2;
@@ -74,6 +78,7 @@ message PeerInfo {
   bool sas_enabled = 6;
   string version = 7;
   int32 conn_id = 8;
+  Features features = 9;
 }
 
 message LoginResponse {
@@ -442,11 +447,6 @@ message OptionMessage {
   BoolOption enable_file_transfer = 9;
 }
 
-message OptionResponse {
-  OptionMessage opt = 1;
-  string error = 2;
-}
-
 message TestDelay {
   int64 time = 1;
   bool from_client = 2;
@@ -469,6 +469,44 @@ message AudioFrame {
   int64 timestamp = 2;
 }
 
+message BackNotification {
+  // no need to consider block input by someone else
+  enum BlockInputState {
+    StateUnknown = 1;
+    OnSucceeded = 2;
+    OnFailed = 3;
+    OffSucceeded = 4;
+    OffFailed = 5;
+  }
+  enum PrivacyModeState {
+    StateUnknown = 1;
+    // Privacy mode on by someone else
+    OnByOther = 2;
+    // Privacy mode is not supported on the remote side
+    NotSupported = 3;
+    // Privacy mode on by self
+    OnSucceeded = 4;
+    // Privacy mode on by self, but denied
+    OnFailedDenied = 5;
+    // Some plugins are not found
+    OnFailedPlugin = 6;
+    // Privacy mode on by self, but failed
+    OnFailed = 7;
+    // Privacy mode off by self
+    OffSucceeded = 8;
+    // Ctrl + P
+    OffByPeer = 9;
+    // Privacy mode off by self, but failed
+    OffFailed = 10;
+    OffUnknown = 11;
+  }
+
+  oneof union {
+    PrivacyModeState privacy_mode_state = 1;
+    BlockInputState block_input_state = 2;
+  }
+}
+
 message Misc {
   oneof union {
     ChatMessage chat_message = 4;
@@ -478,8 +516,8 @@ message Misc {
     AudioFormat audio_format = 8;
     string close_reason = 9;
     bool refresh_video = 10;
-    OptionResponse option_response = 11;
     bool video_received = 12;
+    BackNotification back_notification = 13;
   }
 }
 

libs/hbb_common/src/config.rs

@@ -16,7 +16,7 @@ pub const RENDEZVOUS_TIMEOUT: u64 = 12_000;
 pub const CONNECT_TIMEOUT: u64 = 18_000;
 pub const REG_INTERVAL: i64 = 12_000;
 pub const COMPRESS_LEVEL: i32 = 3;
-const SERIAL: i32 = 1;
+const SERIAL: i32 = 3;
 // 128x128
 #[cfg(target_os = "macos")] // 128x128 on 160x160 canvas, then shrink to 128, mac looks better with padding
 pub const ICON: &str = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAAyVBMVEUAAAAAcf8Acf8Acf8Acv8Acf8Acf8Acf8Acf8AcP8Acf8Ab/8AcP8Acf////8AaP/z+f/o8v/k7v/5/v/T5f8AYP/u9v/X6f+hx/+Kuv95pP8Aef/B1/+TwP9xoP8BdP/g6P+Irv9ZmP8Bgf/E3f98q/9sn/+01f+Es/9nm/9Jif8hhv8off/M4P+syP+avP86iP/c7f+xy/9yqf9Om/9hk/9Rjv+60P99tv9fpf88lv8yjf8Tgf8deP+kvP8BiP8NeP8hkP80gP8oj2VLAAAADXRSTlMA7o7qLvnaxZ1FOxYPjH9HWgAABHJJREFUeNrtm+tW4jAQgBfwuu7MtIUWsOUiCCioIIgLiqvr+z/UHq/LJKVkmwTcc/r9E2nzlU4mSTP9lpGRkZGR8VX5cZjfL+yCEXYL+/nDH//U/Pd8DgyTy39Xbv7oIAcWyB0cqbW/sweW2NtRaj8H1sgpGOwUIAH7Bkd7YJW9dXFwAJY5WNP/cmCZQnJvzIN18on5LwfWySXlxEPYAIcad8D6PdiHDbCfIFCADVBIENiFDbCbIACKPPXrZ+cP8E6/0znvP4EymgIEravIRcTxu8HxNSJ60a8W0AYECKrlAN+YwAthCd9wm1Ug6wKzIn5SgRduXfwkqDasCjx0XFzi9PV6zwNcIuhcWBOg+ikySq8C9UD4dEKWBCoOcspvAuLHTo9sCDQiFPHotRM48j8G5gVur1FdAN2uaYEuiz7xFsgEJ2RUoMUakXuBTHHoGxQYOBhHjeUBAefEnMAowFhaLBOKuOemBBbxLRQrH2PBCgMvNCPQGMeevTb9zLrPxz2Mo+QbEaijzPUcOOHMQZkKGRAIPem39+bypREMPTkQW/oCfk866zAkiIFG4yIKRE/aAnfiSd0WrORY6pFdXQEqi9mvAQm0RIOSnoCcZ8vJoz3diCnjRk+g8VP4/fuQDJ2Lxr6WwG0gXs9aTpDzW0vgDBlVUpixR8gYk44AD8FrUKHr8JQJGgIDnoDqoALxmWPQSi9AVVzm8gKUuEPGr/QCvptwJkbSYT/TC4S8C96DGjTj86aHtAI0x2WaBIq0eSYYpRa4EsdWVVwWu9O0Aj6f6dyBMnwEraeOgSYu0wZlauzA47QCbT7DgAQSE+hZWoEBF/BBmWOewNMK3BsSqKUW4MGcWqCSVmDkbvkXGKQOwg6PAUO9oL3xXhA20yaiCjuwYygRVQlUOTWTCf2SuNJTxeFjgaHByGuAIvd8ItdPLTDhS7IuqEE1YSKVOgbayLhSFQhMzYh8hwfBs1r7c505YVIQYEdNoKwxK06MJiyrpUFHiF0NAfCQUVHoiRclIXJIR6C2fqG37pBHvcWpgwzvAtYwkR5UGV2e42UISdBJETl3mg8ouo54Rcnti1/vaT+iuUQBt500Cgo4U10BeHSkk57FB0JjWkKRMWgLUA0lLodtImAQdaMiiri3+gIAPZQoutHNsgKF1aaDMhMyIdBf8Th+Bh8MTjGWCpl5Wv43tDmnF+IUVMrcZgRoiAxhtrloYizNkZaAnF5leglbNhj0wYCAbCDvGb0mP4nib7O7ZlcYQ2m1gPtIZgVgGNNMeaVAaWR+57TrqgtUnm3sHQ+kYeE6fufUubG1ez50FXbPnWgBlgSABmN3TTcsRl2yWkHRrwbiunvk/W2+Mg1hPZplPDeXRbZzStFH15s1QIVd3UImP5z/bHpeeQLvRJ7XLFUffQIlCvqlXETQbgN9/rlYABGosv+Vi9m2Xs639YLGrZd0br+odetlvdsvbN56abfd4vbCzv9Q3v/ygoOV21A4OPpfXvH4Ai+5ZGRkZGRkbJA/t/I0QMzoMiEAAAAASUVORK5CYII=
@@ -271,7 +271,7 @@ impl Config {
 
     fn file_(suffix: &str) -> PathBuf {
         let name = format!("{}{}", *APP_NAME.read().unwrap(), suffix);
-        Self::path(name).with_extension("toml")
+        Config::with_extension(Self::path(name))
     }
 
     pub fn get_home() -> PathBuf {
@@ -687,6 +687,16 @@ impl Config {
         lock.store();
         true
     }
+
+    fn with_extension(path: PathBuf) -> PathBuf {
+        let ext = path.extension();
+        if let Some(ext) = ext {
+            let ext = format!("{}.toml", ext.to_string_lossy());
+            path.with_extension(&ext)
+        } else {
+            path.with_extension("toml")
+        }
+    }
 }
 
 const PEERS: &str = "peers";
@@ -716,7 +726,7 @@ impl PeerConfig {
 
     fn path(id: &str) -> PathBuf {
         let path: PathBuf = [PEERS, id].iter().collect();
-        Config::path(path).with_extension("toml")
+        Config::with_extension(Config::path(path))
     }
 
     pub fn peers() -> Vec<(String, SystemTime, PeerConfig)> {

libs/hbb_common/src/fs.rs

@@ -195,7 +195,7 @@ pub fn is_file_exists(file_path: &str) -> bool {
 
 #[inline]
 pub fn can_enable_overwrite_detection(version: i64) -> bool {
-    version >= get_version_number("1.2.0")
+    version >= get_version_number("1.1.10")
 }
 
 #[derive(Default)]

libs/hbb_common/src/socket_client.rs

@@ -11,7 +11,10 @@ use tokio_socks::{IntoTargetAddr, TargetAddr};
 
 fn to_socket_addr(host: &str) -> ResultType<SocketAddr> {
     use std::net::ToSocketAddrs;
-    host.to_socket_addrs()?.next().context("Failed to solve")
+    host.to_socket_addrs()?
+        .filter(|x| x.is_ipv4())
+        .next()
+        .context("Failed to solve")
 }
 
 pub fn get_target_addr(host: &str) -> ResultType<TargetAddr<'static>> {
@@ -60,8 +63,9 @@ pub async fn connect_tcp<'t, T: IntoTargetAddr<'t>>(
         .await
     } else {
         let addr = std::net::ToSocketAddrs::to_socket_addrs(&target_addr)?
+            .filter(|x| x.is_ipv4())
             .next()
-            .context("Invalid target addr")?;
+            .context("Invalid target addr, no valid ipv4 address can be resolved.")?;
         Ok(FramedStream::new(addr, local, ms_timeout).await?)
     }
 }

libs/hbb_common/src/udp.rs

@@ -47,7 +47,7 @@ impl FramedSocket {
 
     #[allow(clippy::never_loop)]
     pub async fn new_reuse<T: std::net::ToSocketAddrs>(addr: T) -> ResultType<Self> {
-        for addr in addr.to_socket_addrs()? {
+        for addr in addr.to_socket_addrs()?.filter(|x| x.is_ipv4()) {
             let socket = new_socket(addr, true, 0)?.into_udp_socket();
             return Ok(Self::Direct(UdpFramed::new(
                 UdpSocket::from_std(socket)?,
@@ -61,7 +61,7 @@ impl FramedSocket {
         addr: T,
         buf_size: usize,
     ) -> ResultType<Self> {
-        for addr in addr.to_socket_addrs()? {
+        for addr in addr.to_socket_addrs()?.filter(|x| x.is_ipv4()) {
             return Ok(Self::Direct(UdpFramed::new(
                 UdpSocket::from_std(new_socket(addr, false, buf_size)?.into_udp_socket())?,
                 BytesCodec::new(),