diff --git a/src/main.rs b/src/main.rs index 1d98fd5..32793ff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -18,14 +18,15 @@ const TAIL: [u8;3] = [0x76, 0x66, 0x56]; #[derive(Serialize, Deserialize)] struct VpnPacket { - start: Vec, + //start: Vec, data: Vec, - end: Vec + //end: Vec } impl VpnPacket { fn init(d: Vec) -> Self { - VpnPacket{start: (&HEADER).to_vec(), data: d, end: (&TAIL).to_vec()} + //VpnPacket{start: (&HEADER).to_vec(), data: d, end: (&TAIL).to_vec()} + VpnPacket { data: d } } } diff --git a/src/tcp_client.rs b/src/tcp_client.rs index f0d0c29..99450a0 100644 --- a/src/tcp_client.rs +++ b/src/tcp_client.rs @@ -92,19 +92,19 @@ pub async fn client_mode(remote_addr: String) { }); tokio::spawn(async move { - let mut buf = vec![0; 1024]; + let mut buf = vec![0; 4096]; while let Ok(n) = dev_reader.read(&mut buf) { dx.send(buf[..n].to_vec()).unwrap(); } }); tokio::spawn(async move { - let mut buf = vec![0; 1024]; + let mut buf = vec![0; 4096]; loop { 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(); - if vpn_packet.start != &HEADER || vpn_packet.end != &TAIL { error!("Bad packet"); continue; } + //if vpn_packet.start != &HEADER || vpn_packet.end != &TAIL { error!("Bad packet"); continue; } tx.send(vpn_packet.data).unwrap(); } } diff --git a/src/tcp_server.rs b/src/tcp_server.rs index a1ef514..a882e54 100644 --- a/src/tcp_server.rs +++ b/src/tcp_server.rs @@ -38,7 +38,7 @@ pub async fn server_mode() { }); tokio::spawn(async move { - let mut buf = vec![0; 1024]; + let mut buf = vec![0; 4096]; while let Ok(n) = dev_reader.read(&mut buf) { dx.send(buf[..n].to_vec()).unwrap(); } @@ -64,12 +64,12 @@ pub async fn server_mode() { }); tokio::spawn(async move { - let mut buf = vec![0; 1024]; + let mut buf = vec![0; 4096]; loop { 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(); - if vpn_packet.start != &HEADER || vpn_packet.end != &TAIL { error!("Bad packet"); continue; } + //if vpn_packet.start != &HEADER || vpn_packet.end != &TAIL { error!("Bad packet"); continue; } thread_tx.send(vpn_packet.data).unwrap(); } }