Changes to be committed:
modified: src/tcp_client.rs modified: src/tcp_server.rs
This commit is contained in:
parent
18f631879a
commit
4dac5c5794
@ -87,21 +87,21 @@ 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() {
|
||||||
dev_writer.write(&bytes).unwrap();
|
dev_writer.write_all(&bytes).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut buf = vec![0; 2048];
|
let mut buf = Vec::<u8>::new();
|
||||||
while let Ok(n) = dev_reader.read(&mut buf) {
|
while let Ok(n) = dev_reader.read_to_end(&mut buf) {
|
||||||
dx.send(buf[..n].to_vec()).unwrap();
|
dx.send(buf[..n].to_vec()).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut buf = vec![0; 2048];
|
let mut buf = Vec::<u8>::new();
|
||||||
loop {
|
loop {
|
||||||
if let Ok(n) = sock_reader.read(&mut buf).await {
|
if let Ok(n) = sock_reader.read_to_end(&mut buf).await {
|
||||||
//info!("Catch from socket: {:?}", &buf[..n]);
|
//info!("Catch from socket: {:?}", &buf[..n]);
|
||||||
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
|
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
|
||||||
tx.send(vpn_packet.data).unwrap();
|
tx.send(vpn_packet.data).unwrap();
|
||||||
|
@ -33,13 +33,13 @@ pub async fn server_mode() {
|
|||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
while let Ok(bytes) = rx.recv() {
|
while let Ok(bytes) = rx.recv() {
|
||||||
dev_writer.write(&bytes).unwrap();
|
dev_writer.write_all(&bytes).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut buf = vec![0; 2048];
|
let mut buf = Vec::<u8>::new();
|
||||||
while let Ok(n) = dev_reader.read(&mut buf) {
|
while let Ok(n) = dev_reader.read_to_end(&mut buf) {
|
||||||
dx.send(buf[..n].to_vec()).unwrap();
|
dx.send(buf[..n].to_vec()).unwrap();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@ -64,9 +64,9 @@ pub async fn server_mode() {
|
|||||||
});
|
});
|
||||||
|
|
||||||
tokio::spawn(async move {
|
tokio::spawn(async move {
|
||||||
let mut buf = vec![0; 2048];
|
let mut buf = Vec::<u8>::new();
|
||||||
loop {
|
loop {
|
||||||
if let Ok(n) = sock_reader.read(&mut buf).await {
|
if let Ok(n) = sock_reader.read_to_end(&mut buf).await {
|
||||||
info!("Catched from sock: {:?}", &buf[..n]);
|
info!("Catched from sock: {:?}", &buf[..n]);
|
||||||
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
|
let vpn_packet: VpnPacket = bincode::deserialize(&buf[..n]).unwrap();
|
||||||
thread_tx.send(vpn_packet.data).unwrap();
|
thread_tx.send(vpn_packet.data).unwrap();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user