diff --git a/src/main.rs b/src/main.rs index fc677e5..d6e997e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -12,11 +12,18 @@ use serde_derive::Deserialize; //mod server; mod tcp_client; mod tcp_server; -mod util; #[derive(Serialize, Deserialize)] struct VpnPacket { + start: u8, data: Vec, + end: u8 +} + +impl VpnPacket { + fn init(d: Vec) -> Self { + VpnPacket{start: 0x56, data: d, end: 0x66} + } } #[tokio::main] diff --git a/src/tcp_client.rs b/src/tcp_client.rs index df1fba4..deb0de8 100644 --- a/src/tcp_client.rs +++ b/src/tcp_client.rs @@ -111,9 +111,9 @@ pub async fn client_mode(remote_addr: String) { loop { if let Ok(bytes) = mx.recv() { - let vpn_packet = VpnPacket{ data: bytes }; + let vpn_packet = VpnPacket::init(bytes); let serialized_data = bincode::serialize(&vpn_packet).unwrap(); - sock_writer.write(&serialized_data).await.unwrap(); + sock_writer.write_all(&serialized_data).await.unwrap(); info!("Wrote to sock"); } } diff --git a/src/tcp_server.rs b/src/tcp_server.rs index b10c020..1350406 100644 --- a/src/tcp_server.rs +++ b/src/tcp_server.rs @@ -56,7 +56,7 @@ pub async fn server_mode() { tokio::spawn(async move { loop { if let Ok(bytes) = thread_mx.recv() { - let vpn_packet = VpnPacket{ data: bytes }; + let vpn_packet = VpnPacket::init(bytes); let serialized_data = bincode::serialize(&vpn_packet).unwrap(); sock_writer.write_all(&serialized_data).await.unwrap(); info!("Wrote to sock"); diff --git a/src/util.rs b/src/util.rs deleted file mode 100644 index 36d4887..0000000 --- a/src/util.rs +++ /dev/null @@ -1,7 +0,0 @@ -use serde_derive::Serialize; -use serde_derive::Deserialize; - -#[derive(Serialize, Deserialize)] -struct VpnPacket { - data: Vec, -} \ No newline at end of file