Changes to be committed:

modified:   src/tcp_client.rs
	modified:   src/tcp_server.rs
This commit is contained in:
Michael Wain 2024-08-15 06:07:54 +03:00
parent e7d0a5bb96
commit 05f3360a78
2 changed files with 7 additions and 7 deletions

View File

@ -92,7 +92,7 @@ pub async fn client_mode(remote_addr: String) {
}); });
tokio::spawn(async move { tokio::spawn(async move {
let mut buf = vec![0; 4096]; let mut buf = vec![0; 8192];
while let Ok(n) = dev_reader.read(&mut buf) { while let Ok(n) = dev_reader.read(&mut buf) {
dx.send(buf[..n].to_vec()).unwrap(); dx.send(buf[..n].to_vec()).unwrap();
} }
@ -102,9 +102,9 @@ pub async fn client_mode(remote_addr: String) {
let mut buf = vec![0; 4096]; let mut buf = vec![0; 4096];
loop { loop {
if let Ok(l) = sock_reader.read_u64().await { if let Ok(l) = sock_reader.read_u64().await {
buf = vec![0; l.try_into().unwrap()]; buf = vec![0; l as usize];
if let Ok(n) = sock_reader.read(&mut buf).await { if let Ok(n) = sock_reader.read_exact(&mut buf).await {
info!("Catch from socket"); info!("Catch from socket {:?} | {:?}", l, l as usize);
match VpnPacket::deserialize((&buf[..n]).to_vec()) { match VpnPacket::deserialize((&buf[..n]).to_vec()) {
Ok(vpn_packet) => tx.send(vpn_packet.data).unwrap(), Ok(vpn_packet) => tx.send(vpn_packet.data).unwrap(),
Err(error) => error!("Deserialization error {:?}", error), Err(error) => error!("Deserialization error {:?}", error),

View File

@ -124,11 +124,11 @@ pub async fn server_mode(bind_addr: String) {
}); });
tokio::spawn(async move { tokio::spawn(async move {
let mut buf = vec![0; 4096]; let mut buf = vec![0; 8192];
loop { loop {
if let Ok(l) = sock_reader.read_u64().await { if let Ok(l) = sock_reader.read_u64().await {
buf = vec![0; l.try_into().unwrap()]; buf = vec![0; l as usize];
if let Ok(n) = sock_reader.read(&mut buf).await { if let Ok(n) = sock_reader.read_exact(&mut buf).await {
//info!("Catched from sock: {:?}", &buf[..n]); //info!("Catched from sock: {:?}", &buf[..n]);
match VpnPacket::deserialize((&buf[..n]).to_vec()) { match VpnPacket::deserialize((&buf[..n]).to_vec()) {
Ok(vpn_packet) => thread_tx.send(vpn_packet.data).unwrap(), Ok(vpn_packet) => thread_tx.send(vpn_packet.data).unwrap(),