Changes to be committed:

modified:   src/tcp_client.rs
	modified:   src/tcp_server.rs
This commit is contained in:
Michael Wain 2024-08-12 05:08:32 +03:00
parent b179eacfba
commit db2221080e
2 changed files with 4 additions and 4 deletions

View File

@ -88,7 +88,6 @@ pub async fn client_mode(remote_addr: String) {
tokio::spawn(async move { tokio::spawn(async move {
while let Ok(bytes) = rx.recv() { while let Ok(bytes) = rx.recv() {
dev_writer.write(&bytes).unwrap(); dev_writer.write(&bytes).unwrap();
info!("Wrote to tun");
} }
}); });
@ -103,6 +102,7 @@ pub async fn client_mode(remote_addr: String) {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
loop { loop {
if let Ok(n) = sock_reader.read(&mut buf).await { if let Ok(n) = sock_reader.read(&mut buf).await {
info!("Catch from socket: {:?}", &buf[..n]);
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap(); let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
tx.send(vpn_packet.data).unwrap(); tx.send(vpn_packet.data).unwrap();
} }
@ -113,8 +113,8 @@ pub async fn client_mode(remote_addr: String) {
if let Ok(bytes) = mx.recv() { if let Ok(bytes) = mx.recv() {
let vpn_packet = VpnPacket::init(bytes); let vpn_packet = VpnPacket::init(bytes);
let serialized_data = bincode::serialize(&vpn_packet).unwrap(); let serialized_data = bincode::serialize(&vpn_packet).unwrap();
info!("Writing to sock: {:?}", serialized_data);
sock_writer.write_all(&serialized_data).await.unwrap(); sock_writer.write_all(&serialized_data).await.unwrap();
info!("Wrote to sock");
} }
} }
} }

View File

@ -34,7 +34,6 @@ pub async fn server_mode() {
tokio::spawn(async move { tokio::spawn(async move {
while let Ok(bytes) = rx.recv() { while let Ok(bytes) = rx.recv() {
dev_writer.write(&bytes).unwrap(); dev_writer.write(&bytes).unwrap();
info!("Wrote to tun");
} }
}); });
@ -59,7 +58,7 @@ pub async fn server_mode() {
let vpn_packet = VpnPacket::init(bytes); let vpn_packet = VpnPacket::init(bytes);
let serialized_data = bincode::serialize(&vpn_packet).unwrap(); let serialized_data = bincode::serialize(&vpn_packet).unwrap();
sock_writer.write_all(&serialized_data).await.unwrap(); sock_writer.write_all(&serialized_data).await.unwrap();
info!("Wrote to sock"); info!("Wrote to sock: {:?}", serialized_data);
} }
} }
}); });
@ -68,6 +67,7 @@ pub async fn server_mode() {
let mut buf = vec![0; 2048]; let mut buf = vec![0; 2048];
loop { loop {
if let Ok(n) = sock_reader.read(&mut buf).await { if let Ok(n) = sock_reader.read(&mut buf).await {
info!("Catched from sock: {:?}", &buf[..n]);
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap(); let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
thread_tx.send(vpn_packet.data).unwrap(); thread_tx.send(vpn_packet.data).unwrap();
} }