Changes to be committed:

modified:   src/main.rs
	modified:   src/tcp_client.rs
	modified:   src/tcp_server.rs
	deleted:    src/util.rs
This commit is contained in:
Michael Wain 2024-08-12 05:02:45 +03:00
parent 9530aa43c0
commit b179eacfba
4 changed files with 11 additions and 11 deletions

View File

@ -12,11 +12,18 @@ use serde_derive::Deserialize;
//mod server; //mod server;
mod tcp_client; mod tcp_client;
mod tcp_server; mod tcp_server;
mod util;
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
struct VpnPacket { struct VpnPacket {
start: u8,
data: Vec<u8>, data: Vec<u8>,
end: u8
}
impl VpnPacket {
fn init(d: Vec<u8>) -> Self {
VpnPacket{start: 0x56, data: d, end: 0x66}
}
} }
#[tokio::main] #[tokio::main]

View File

@ -111,9 +111,9 @@ pub async fn client_mode(remote_addr: String) {
loop { loop {
if let Ok(bytes) = mx.recv() { 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(); 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"); info!("Wrote to sock");
} }
} }

View File

@ -56,7 +56,7 @@ pub async fn server_mode() {
tokio::spawn(async move { tokio::spawn(async move {
loop { loop {
if let Ok(bytes) = thread_mx.recv() { 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(); 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");

View File

@ -1,7 +0,0 @@
use serde_derive::Serialize;
use serde_derive::Deserialize;
#[derive(Serialize, Deserialize)]
struct VpnPacket {
data: Vec<u8>,
}