From 5bc50b0e29df24fac1fc311660eef53def4e5d84 Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Mon, 12 Aug 2024 04:24:52 +0300
Subject: [PATCH]  Changes to be committed: 	modified:   src/tcp_client.rs 
 modified:   src/tcp_server.rs

---
 src/tcp_client.rs | 5 ++---
 src/tcp_server.rs | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/tcp_client.rs b/src/tcp_client.rs
index b30854d..eac6a6a 100644
--- a/src/tcp_client.rs
+++ b/src/tcp_client.rs
@@ -9,6 +9,7 @@ use std::sync::Arc;
 use std::net::SocketAddr;
 use std::collections::HashMap;
 use std::process::Command;
+use tokio::io::AsyncReadExt;
 
 fn configure_routes() {
     let ip_output = Command::new("ip")
@@ -93,16 +94,14 @@ pub async fn client_mode(remote_addr: String) {
         let mut buf = vec![0; 2048];
         while let Ok(n) = dev_reader.read(&mut buf) {
             dx.send(buf[..n].to_vec()).unwrap();
-            info!("Got from tun");
         }
     });
 
     tokio::spawn(async move {
         let mut buf = vec![0; 2048];
         loop {
-            if let Ok(n) = sock_reader.try_read(&mut buf) {
+            if let Ok(n) = sock_reader.read(&mut buf).await {
                 tx.send(buf[..n].to_vec()).unwrap();
-                info!("Got from sock");
             }
         }
     });
diff --git a/src/tcp_server.rs b/src/tcp_server.rs
index 91d7d89..18c17e8 100644
--- a/src/tcp_server.rs
+++ b/src/tcp_server.rs
@@ -8,6 +8,7 @@ use log::{error, info, LevelFilter};
 use std::sync::Arc;
 use std::net::SocketAddr;
 use std::collections::HashMap;
+use tokio::io::AsyncReadExt;
 
 pub async fn server_mode() {
     info!("Starting server...");
@@ -39,7 +40,6 @@ pub async fn server_mode() {
         let mut buf = vec![0; 2048];
         while let Ok(n) = dev_reader.read(&mut buf) {
             dx.send(buf[..n].to_vec()).unwrap();
-            info!("Got from tun");
         }
     });
 
@@ -63,9 +63,8 @@ pub async fn server_mode() {
         tokio::spawn(async move {
             let mut buf = vec![0; 2048];
             loop {
-                if let Ok(n) = sock_reader.try_read(&mut buf) {
+                if let Ok(n) = sock_reader.read(&mut buf).await {
                     thread_tx.send(buf[..n].to_vec()).unwrap();
-                    info!("Got from sock");
                 }
             }
         });