fix: port forward & RDP check

flutter/lib/desktop/pages/port_forward_page.dart

@@ -49,7 +49,10 @@ class _PortForwardPageState extends State<PortForwardPage>
   void initState() {
     super.initState();
     _ffi = FFI();
-    _ffi.start(widget.id, isPortForward: true, forceRelay: widget.forceRelay);
+    _ffi.start(widget.id,
+        isPortForward: true,
+        forceRelay: widget.forceRelay,
+        isRdp: widget.isRDP);
     Get.put(_ffi, tag: 'pf_${widget.id}');
     if (!Platform.isLinux) {
       Wakelock.enable();

flutter/lib/models/model.dart

@@ -1597,6 +1597,7 @@ class FFI {
   void start(String id,
       {bool isFileTransfer = false,
       bool isPortForward = false,
+      bool isRdp = false,
       String? switchUuid,
       String? password,
       bool? forceRelay}) {
@@ -1619,6 +1620,7 @@ class FFI {
       id: id,
       isFileTransfer: isFileTransfer,
       isPortForward: isPortForward,
+      isRdp: isRdp,
       switchUuid: switchUuid ?? "",
       forceRelay: forceRelay ?? false,
       password: password ?? "",

src/flutter.rs

@@ -505,7 +505,7 @@ impl InvokeUiSession for FlutterHandler {
             match hook {
                 SessionHook::OnSessionRgba(cb) => {
                     cb(key.to_owned(), rgba);
-                },
+                }
             }
         }
         // If the current rgba is not fetched by flutter, i.e., is valid.
@@ -688,6 +688,7 @@ pub fn session_add(
     id: &str,
     is_file_transfer: bool,
     is_port_forward: bool,
+    is_rdp: bool,
     switch_uuid: &str,
     force_relay: bool,
     password: String,
@@ -704,11 +705,14 @@ pub fn session_add(
         ..Default::default()
     };
 
-    // TODO rdp
     let conn_type = if is_file_transfer {
         ConnType::FILE_TRANSFER
     } else if is_port_forward {
-        ConnType::PORT_FORWARD
+        if is_rdp {
+            ConnType::RDP
+        } else {
+            ConnType::PORT_FORWARD
+        }
     } else {
         ConnType::DEFAULT_CONN
     };
@@ -725,7 +729,11 @@ pub fn session_add(
         .unwrap()
         .initialize(session_id, conn_type, switch_uuid, force_relay);
 
-    if let Some(same_id_session) = SESSIONS.write().unwrap().insert(id.to_owned(), session.clone()) {
+    if let Some(same_id_session) = SESSIONS
+        .write()
+        .unwrap()
+        .insert(id.to_owned(), session.clone())
+    {
         same_id_session.close();
     }
 
@@ -1068,4 +1076,4 @@ unsafe extern "C" fn get_rgba() {}
 #[derive(Clone)]
 pub enum SessionHook {
     OnSessionRgba(fn(String, &mut scrap::ImageRgb)),
-}
+}

src/flutter_ffi.rs

@@ -76,6 +76,7 @@ pub fn session_add_sync(
     id: String,
     is_file_transfer: bool,
     is_port_forward: bool,
+    is_rdp: bool,
     switch_uuid: String,
     force_relay: bool,
     password: String,
@@ -84,6 +85,7 @@ pub fn session_add_sync(
         &id,
         is_file_transfer,
         is_port_forward,
+        is_rdp,
         &switch_uuid,
         force_relay,
         password,

src/port_forward.rs

@@ -92,6 +92,7 @@ pub async fn listen(
                         break;
                     }
                     Some(Data::NewRDP) => {
+                        println!("receive run_rdp from ui_receiver");
                         run_rdp(addr.port());
                     }
                     _ => {}

src/ui_session_interface.rs

@@ -88,11 +88,11 @@ impl<T: InvokeUiSession> Session<T> {
     }
 
     pub fn is_port_forward(&self) -> bool {
-        self.lc
+        let conn_type = self.lc
             .read()
             .unwrap()
-            .conn_type
-            .eq(&ConnType::PORT_FORWARD)
+            .conn_type;
+        conn_type == ConnType::PORT_FORWARD || conn_type == ConnType::RDP
     }
 
     #[cfg(not(any(target_os = "android", target_os = "ios")))]