github/dndx-phantun
1
0
Fork 0
mirror of https://github.com/dndx/phantun.git synced 2025-01-19 06:19:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(phantun) better UDP error handling

Browse Source 
When UDP send fails, print a proper error message and close the
connection, instead of `panic`ing.
This commit is contained in:
Datong Sun 2021-09-27 09:49:50 -07:00
parent e3e50f8a9e
commit 5a6ebf52ea
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phantun/src/bin/client.rs
View File

@ -139,7 +139,11 @@ async fn main() {
match res { match res {
Some(size) => { Some(size) => {
if size > 0 { if size > 0 {
udp_sock.send(&buf_tcp[..size]).await.unwrap(); if let Err(e) = udp_sock.send(&buf_tcp[..size]).await {
connections.write().await.remove(&addr);
error!("Unable to send UDP packet to {}: {}, closing connection", e, addr);
return;
}
} }
}, },
None => { None => {

7
phantun/src/bin/server.rs
View File

@ -3,7 +3,7 @@ extern crate dndx_fork_tokio_tun as tokio_tun;
use clap::{App, Arg}; use clap::{App, Arg};
use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::packet::MAX_PACKET_LEN;
use fake_tcp::Stack; use fake_tcp::Stack;
use log::info; use log::{error, info};
use std::net::SocketAddrV4; use std::net::SocketAddrV4;
use tokio::net::UdpSocket; use tokio::net::UdpSocket;
use tokio::time::{self, Duration}; use tokio::time::{self, Duration};
@ -90,7 +90,10 @@ async fn main() {
match res { match res {
Some(size) => { Some(size) => {
if size > 0 { if size > 0 {
udp_sock.send(&buf_tcp[..size]).await.unwrap(); if let Err(e) = udp_sock.send(&buf_tcp[..size]).await {
error!("Unable to send UDP packet to {}: {}, closing connection", e, remote_addr);
return;
}
} }
}, },
None => { return; }, None => { return; },