Skip to content

Use correct timeout for Socket#connect on Windows #14961

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
straight-shoota merged 1 commit into from
Sep 4, 2024
Merged

Use correct timeout for Socket#connect on Windows #14961

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/crystal/system/win32/event_loop_iocp.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ class Crystal::IOCP::EventLoop < Crystal::EventLoop
end

def connect(socket : ::Socket, address : ::Socket::Addrinfo | ::Socket::Address, timeout : ::Time::Span?) : IO::Error?
socket.overlapped_connect(socket.fd, "ConnectEx") do |overlapped|
socket.overlapped_connect(socket.fd, "ConnectEx", timeout) do |overlapped|
# This is: LibC.ConnectEx(fd, address, address.size, nil, 0, nil, overlapped)
Crystal::System::Socket.connect_ex.call(socket.fd, address.to_unsafe, address.size, Pointer(Void).null, 0_u32, Pointer(UInt32).null, overlapped.to_unsafe)
end
Expand Down
4 changes: 2 additions & 2 deletions src/crystal/system/win32/socket.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ module Crystal::System::Socket
end

# :nodoc:
def overlapped_connect(socket, method, &)
def overlapped_connect(socket, method, timeout, &)
IOCP::OverlappedOperation.run(socket) do |operation|
result = yield operation

Expand All @@ -145,7 +145,7 @@ module Crystal::System::Socket
return nil
end

operation.wait_for_wsa_result(read_timeout) do |error|
operation.wait_for_wsa_result(timeout) do |error|
case error
when .wsa_io_incomplete?, .wsaeconnrefused?
return ::Socket::ConnectError.from_os_error(method, error)
Expand Down