diff --git a/Cargo.lock b/Cargo.lock index 3c43442..d38db88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -571,6 +571,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + [[package]] name = "home" version = "0.5.9" @@ -1211,6 +1217,7 @@ dependencies = [ "env_logger", "futures", "generic-array", + "hex", "log", "net-route", "packet", diff --git a/Cargo.toml b/Cargo.toml index 2231422..da529e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,3 +31,4 @@ ctrlc2 = "3.5" crossbeam-channel = "0.5.13" pnet = "0.35.0" net-route = "0.4.4" +hex = "0.4" \ No newline at end of file diff --git a/src/client.rs b/src/client.rs index ff9171c..065c6dd 100644 --- a/src/client.rs +++ b/src/client.rs @@ -90,7 +90,7 @@ pub async fn client_mode(remote_addr: String) { tokio::spawn(async move { while let Ok(bytes) = rx.recv() { - //info!("Write to tun"); + info!("Write to tun {:?}", hex::encode(&bytes)); dev_writer.write_all(&bytes).unwrap(); } }); @@ -106,7 +106,7 @@ pub async fn client_mode(remote_addr: String) { let mut buf = vec![0; 4096]; loop { if let Ok(l) = sock_rec.recv(&mut buf).await { - tx.send((&buf[1..l]).to_vec()); + tx.send((&buf[..l]).to_vec()); } } }); @@ -118,7 +118,7 @@ pub async fn client_mode(remote_addr: String) { if let Ok(bytes) = mx.recv() { let vpn_packet = UDPVpnPacket{ data: bytes }; let serialized_data = vpn_packet.serialize(); - //info!("Writing to sock: {:?}", serialized_data); + info!("Writing to sock: {:?}", serialized_data); sock_snd.send(&serialized_data).await.unwrap(); } }