Changes to be committed:

modified:   src/main.rs
	modified:   src/tcp_client.rs
	modified:   src/tcp_server.rs

src/main.rs

@@ -19,18 +19,12 @@ const TAIL: [u8;3] = [0x76, 0x66, 0x56];
 
 #[derive(Serialize, Deserialize)]
 struct VpnPacket {
-    //start: Vec<u8>,
+    //start: Vec<u8>
-    data: Vec<u8>,
+    len: u64,
+    data: Vec<u8>
     //end: Vec<u8>
 }
 
-impl VpnPacket {
-    fn init(d: Vec<u8>) -> Self {
-        //VpnPacket{start: (&HEADER).to_vec(), data: d, end: (&TAIL).to_vec()}
-        VpnPacket { data: d }
-    }
-}
-
 #[tokio::main]
 async fn main() {
 

src/tcp_client.rs

@@ -114,7 +114,7 @@ pub async fn client_mode(remote_addr: String) {
 
     loop {
         if let Ok(bytes) = mx.recv() {
-            let vpn_packet = VpnPacket::init(bytes);
+            let vpn_packet = VpnPacket{ len: bytes.len() as u64, data: bytes };
             let serialized_data = bincode::serialize::<VpnPacket>(&vpn_packet).unwrap();
             //info!("Writing to sock: {:?}", serialized_data);
             sock_writer.write_all(&serialized_data).await.unwrap();

src/tcp_server.rs

@@ -115,7 +115,7 @@ pub async fn server_mode(bind_addr: String) {
         tokio::spawn(async move {
             loop {
                 if let Ok(bytes) = thread_mx.recv() {
-                    let vpn_packet = VpnPacket::init(bytes);
+                    let vpn_packet = VpnPacket{ len: bytes.len() as u64, data: bytes };
                     let serialized_data = bincode::serialize::<VpnPacket>(&vpn_packet).unwrap();
                     sock_writer.write_all(&serialized_data).await.unwrap();
                     //info!("Wrote to sock: {:?}", serialized_data);