From 8e15facee32fdf7f4d95dbcea9a88ba468af2641 Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Wed, 11 Dec 2024 01:27:29 +0300
Subject: [PATCH] 	modified:   frida_client/src/client.rs 	modified:  
 frida_core/src/android_tun.rs

---
 frida_client/src/client.rs    |  2 +-
 frida_core/src/android_tun.rs | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/frida_client/src/client.rs b/frida_client/src/client.rs
index 34b3fbf..d59bac3 100644
--- a/frida_client/src/client.rs
+++ b/frida_client/src/client.rs
@@ -180,9 +180,9 @@ pub mod android {
         async fn start(&self) {
             info!("FD: {:?}", &self.fd);
             let mtu: u16 = 1400;
-            let (reader, writer) = frida_core::create(self.fd);
             let mut client = CoreVpnClient{client_config: self.client_config.clone(), close_token: self.close_token.clone()};
             info!("SSS: {:?}", &self.client_config.server.endpoint);
+            let (reader, writer) = frida_core::create(self.fd);
             let sock = UdpSocket::bind("0.0.0.0:0").await.unwrap();
             sock.connect(&self.client_config.server.endpoint).await.unwrap();
             client.start(sock, reader, writer, mtu).await;
diff --git a/frida_core/src/android_tun.rs b/frida_core/src/android_tun.rs
index 6ab099a..57004e2 100644
--- a/frida_core/src/android_tun.rs
+++ b/frida_core/src/android_tun.rs
@@ -8,13 +8,13 @@ pub fn create(cfg: i32) -> (DeviceReader, DeviceWriter) {
     let fd1 = cfg.clone();
     let fd2 = fd1.clone();
     let mut reader = unsafe { File::from_raw_fd(fd1) };
-    //let mut writer = unsafe { File::from_raw_fd(fd2) };
+    let mut writer = unsafe { File::from_raw_fd(fd2) };
     
-    (DeviceReader {reader}, DeviceWriter {writer: None})
+    (DeviceReader {reader}, DeviceWriter {writer})
 }
 
 pub struct DeviceWriter {
-    writer: Option<File>
+    writer: File
 }
 
 pub struct DeviceReader {
@@ -23,10 +23,7 @@ pub struct DeviceReader {
 
 impl DeviceWriter {
     pub async fn write(&mut self, buf: &Vec<u8>) -> Result<usize, Box<dyn Error>> {
-        /*if self.writer.is_some() {
-            return Ok(self.writer.unwrap().write(buf).await?);
-        }*/
-        Ok(0)
+        Ok(self.writer.unwrap().write(buf).await?)
     }
 }