Skip to content

fix(net): preserve TCP port ownership through TIME_WAIT #2322

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
fslongjin merged 2 commits into from
Sep 22, 2026
Merged

fix(net): preserve TCP port ownership through TIME_WAIT #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f278f81
fix(net): preserve TCP port ownership through TIME_WAIT
fslongjin Sep 22, 2026
3aedf29
chore(net): pin merged smoltcp TIME_WAIT revision
fslongjin Sep 22, 2026
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
2 changes: 1 addition & 1 deletion kernel/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ linkme = "=0.3.27"
num = { version = "=0.4.0", default-features = false }
num-derive = "=0.3"
num-traits = { git = "https://git.mirrors.dragonos.org.cn/DragonOS-Community/num-traits.git", rev = "1597c1c", default-features = false }
smoltcp = { version = "=0.12.0", git = "https://github.com/DragonOS-Community/smoltcp", rev = "afde7359455a5b9feacd2b8684994232acbf8903", default-features = false, features = [
smoltcp = { version = "=0.12.0", git = "https://github.com/DragonOS-Community/smoltcp", rev = "9b9813e25323fb574f80b8aebfbbf2e7809f47ab", default-features = false, features = [
"alloc",
"medium-ethernet",
"socket-raw",
Expand Down
6 changes: 4 additions & 2 deletions kernel/src/driver/net/iface_common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,9 +533,9 @@ impl IfaceCommon {
let routed_this_round = route_policy.is_some();
let owner_is_up = scope == IfacePollScope::Full;

let timestamp = crate::time::Instant::now().into();
let mut sockets = self.sockets.lock();
let mut interface = self.smol_iface.lock();
let timestamp = crate::time::Instant::now().into();
if self.poll_scope() != scope {
drop(interface);
drop(sockets);
Expand Down Expand Up @@ -720,9 +720,9 @@ impl IfaceCommon {
let routed_this_round = route_policy.is_some();
let owner_is_up = scope == IfacePollScope::Full;

let timestamp = crate::time::Instant::now().into();
let mut sockets = self.sockets.lock();
let mut interface = self.smol_iface.lock();
let timestamp = crate::time::Instant::now().into();
if self.poll_scope() != scope {
drop(interface);
drop(sockets);
Expand Down Expand Up @@ -864,6 +864,8 @@ impl IfaceCommon {
let _ = interface.poll_egress(timestamp, device, &mut sockets);
}

self.tcp_close_defer.reap_closed(timestamp, &mut sockets);

self.release_resolved_routed_outputs(
&mut interface,
timestamp,
Expand Down
Loading
Loading