Skip to content

improvement: more random port allocation on windows #107

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
merged 1 commit into from
Sep 17, 2025
Merged

improvement: more random port allocation on windows #107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions core/socket_lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ impl CursorSocket {
let mut listener = None;

// Try to bind, incrementing port if necessary
for _ in 0..100 {
for try_num in 0..500 {
let addr = format!("127.0.0.1:{port}");
match TcpListener::bind(addr) {
Ok(l) => {
Expand All @@ -203,6 +203,10 @@ impl CursorSocket {
Err(_) => {
log::info!("Port {port} is in use, trying next port...");
port += 1;
if try_num != 0 && try_num % 100 == 0 {
port += 100;
}
std::thread::sleep(std::time::Duration::from_millis(10));
}
}
}
Expand Down Expand Up @@ -302,7 +306,7 @@ fn socket_path_to_port(socket_path: &str) -> u16 {
// First try to read the port from the file
if let Ok(content) = fs::read_to_string(socket_path) {
if let Ok(port) = content.trim().parse::<u16>() {
log::debug!("Found port {port} in file {socket_path}");
log::info!("Found port {port} in file {socket_path}");
port
} else {
log::warn!("Could not parse port from file {socket_path}: '{content}'");
Expand All @@ -321,5 +325,5 @@ fn calculate_port_from_hash(socket_path: &str) -> u16 {
hash = ((hash << 5).wrapping_add(hash)).wrapping_add(byte as u32);
}
// Use ports in range 49152-65535 (dynamic/private range)
(hash % 16384 + 49152) as u16
(hash % 15900 + 49152) as u16
}
Loading