Changes to be committed:
modified: src/client.rs modified: src/server.rs
This commit is contained in:
parent
f173bbdc12
commit
03e832b588
@ -90,7 +90,7 @@ pub async fn client_mode(remote_addr: String) {
|
|||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
while let Ok(bytes) = rx.recv() {
|
while let Ok(bytes) = rx.recv() {
|
||||||
info!("Write to tun");
|
//info!("Write to tun");
|
||||||
dev_writer.write_all(&bytes).unwrap();
|
dev_writer.write_all(&bytes).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -106,7 +106,7 @@ pub async fn client_mode(remote_addr: String) {
|
|||||||
let mut buf = vec![0; 4096];
|
let mut buf = vec![0; 4096];
|
||||||
loop {
|
loop {
|
||||||
if let Ok(l) = sock_rec.recv(&mut buf).await {
|
if let Ok(l) = sock_rec.recv(&mut buf).await {
|
||||||
tx.send((&buf[..l]).to_vec());
|
tx.send((&buf[1..l]).to_vec());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -118,7 +118,7 @@ pub async fn client_mode(remote_addr: String) {
|
|||||||
if let Ok(bytes) = mx.recv() {
|
if let Ok(bytes) = mx.recv() {
|
||||||
let vpn_packet = UDPVpnPacket{ data: bytes };
|
let vpn_packet = UDPVpnPacket{ data: bytes };
|
||||||
let serialized_data = vpn_packet.serialize();
|
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();
|
sock_snd.send(&serialized_data).await.unwrap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,7 +54,7 @@ pub async fn server_mode(bind_addr: String) {
|
|||||||
let ip = IpAddr::V4(Ipv4Addr::new(buf[16], buf[17], buf[18], buf[19]));
|
let ip = IpAddr::V4(Ipv4Addr::new(buf[16], buf[17], buf[18], buf[19]));
|
||||||
let mp = addrs_cl.lock().await;
|
let mp = addrs_cl.lock().await;
|
||||||
if let Some(peer) = mp.get(&ip) {
|
if let Some(peer) = mp.get(&ip) {
|
||||||
info!("Sent to client");
|
//info!("Sent to client");
|
||||||
sock_snd.send_to(&buf[..n], peer.addr).await;
|
sock_snd.send_to(&buf[..n], peer.addr).await;
|
||||||
} else {
|
} else {
|
||||||
mp.values().for_each(| peer | { sock_snd.send_to(&buf[..n], peer.addr); });
|
mp.values().for_each(| peer | { sock_snd.send_to(&buf[..n], peer.addr); });
|
||||||
|
Loading…
x
Reference in New Issue
Block a user