Skip to content

server: Improve handling of sockets which go away #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xv-ian-c merged 3 commits into from
Nov 22, 2024
Merged

server: Improve handling of sockets which go away #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c24d582
lightway-server: tcp: close connection on any receive error
xv-ian-c Nov 21, 2024
67e9a97
lightway-server: Do not exit if `inside_data_received` fails
xv-ian-c Nov 21, 2024
5e2fa55
lightway-core: Ignore errors in `Connection::disconnect`
xv-ian-c Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lightway-core/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,8 @@ impl<AppState: Send> Connection<AppState> {
let msg = wire::Frame::Goodbye;

// here, goodbye + shutdown are just a courtesy.
self.send_frame_or_drop(msg)?;
let _ = self.session.try_shutdown()?;
let _ = self.send_frame_or_drop(msg);
let _ = self.session.try_shutdown();

self.set_state(State::Disconnected)?;

Expand Down
3 changes: 2 additions & 1 deletion lightway-server/src/io/outside/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ async fn handle_connection(
match sock.try_read_buf(&mut buf) {
Ok(0) => {
// EOF
conn.handle_end_of_stream();
break anyhow!("End of stream");
}
Ok(_nr) => {}
Expand All @@ -157,6 +156,8 @@ async fn handle_connection(
}
};

conn.handle_end_of_stream();

info!("Connection closed: {:?}", err);
}

Expand Down
8 changes: 5 additions & 3 deletions lightway-server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,11 @@ pub async fn server<SA: for<'a> ServerAuth<AuthState<'a>> + Sync + Send + 'stati
metrics::tun_rejected_packet_invalid_inside_packet();
}
Err(err) => {
metrics::tun_rejected_packet_invalid_other();
// TODO: fatal vs non-fatal;
break Err(anyhow!(err).context("Inside data handling error"));
let fatal = err.is_fatal(conn.connection_type());
metrics::tun_rejected_packet_invalid_other(fatal);
if fatal {
conn.handle_end_of_stream();
}
}
}
} else {
Expand Down
7 changes: 3 additions & 4 deletions lightway-server/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ static METRIC_TUN_REJECTED_INVALID_STATE: LazyLock<Counter> =
LazyLock::new(|| counter!("tun_rejected_packet_invalid_state"));
static METRIC_TUN_REJECTED_INVALID_INSIDE_PACKET: LazyLock<Counter> =
LazyLock::new(|| counter!("tun_rejected_packet_invalid_inside_packet"));
static METRIC_TUN_REJECTED_OTHER: LazyLock<Counter> =
LazyLock::new(|| counter!("tun_rejected_packet_invalid_other"));
static METRIC_TUN_REJECTED_OTHER: &str = "tun_rejected_packet_invalid_other";
static METRIC_TUN_REJECTED_NO_CONNECTION: LazyLock<Counter> =
LazyLock::new(|| counter!("tun_rejected_packet_no_connection"));
static METRIC_TUN_REJECTED_NO_CLIENT_IP: LazyLock<Counter> =
Expand Down Expand Up @@ -279,8 +278,8 @@ pub(crate) fn tun_rejected_packet_invalid_inside_packet() {
}

/// Tunnel rejected packet, other reasons
pub(crate) fn tun_rejected_packet_invalid_other() {
METRIC_TUN_REJECTED_OTHER.increment(1);
pub(crate) fn tun_rejected_packet_invalid_other(fatal: bool) {
counter!(METRIC_TUN_REJECTED_OTHER, FATAL_LABEL => fatal.to_string()).increment(1);
}

/// Tunnel rejected packet, no corresponding
Expand Down