-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
add fn UdpConnectToAddress #25615
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.
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
Closed
Closed
add fn UdpConnectToAddress #25615
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -857,8 +857,8 @@ pub const TcpConnectToAddressError = posix.SocketError || posix.ConnectError; | |
|
|
||
| pub fn tcpConnectToAddress(address: Address) TcpConnectToAddressError!Stream { | ||
| const nonblock = 0; | ||
| const sock_flags = posix.SOCK.STREAM | nonblock | | ||
| (if (native_os == .windows) 0 else posix.SOCK.CLOEXEC); | ||
| const winFlag = (if (native_os == .windows) 0 else posix.SOCK.CLOEXEC); | ||
| const sock_flags = posix.SOCK.DGRAM | nonblock | winFlag; | ||
| const sockfd = try posix.socket(address.any.family, sock_flags, posix.IPPROTO.TCP); | ||
| errdefer Stream.close(.{ .handle = sockfd }); | ||
|
|
||
|
|
@@ -867,6 +867,22 @@ pub fn tcpConnectToAddress(address: Address) TcpConnectToAddressError!Stream { | |
| return Stream{ .handle = sockfd }; | ||
| } | ||
|
|
||
|
|
||
| pub const UdpConnectToAddressError = posix.SocketError || posix.ConnectError; | ||
|
|
||
| pub fn udpConnectToAddress(address: Address) UdpConnectToAddressError!Stream { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. UDP is connectionless so it doesn't make sense to connect via UDP. Returning a stream also doesn't make sense, as UDP transmits individual datagrams and not a continuous stream of data. |
||
| const nonblock = 0; | ||
| const winFlag = (if (native_os == .windows) 0 else posix.SOCK.CLOEXEC); | ||
| const sock_flags = posix.SOCK.DGRAM | nonblock | winFlag; | ||
| const sockfd = try posix.socket(address.any.family, sock_flags, posix.IPPROTO.UDP); | ||
| errdefer Stream.close(.{ .handle = sockfd }); | ||
|
|
||
| try posix.connect(sockfd, &address.any, address.getOsSockLen()); | ||
|
|
||
| return Stream{ .handle = sockfd }; | ||
| } | ||
|
|
||
|
|
||
| // TODO: Instead of having a massive error set, make the error set have categories, and then | ||
| // store the sub-error as a diagnostic value. | ||
| const GetAddressListError = Allocator.Error || File.OpenError || File.ReadError || posix.SocketError || posix.BindError || posix.SetSockOptError || error{ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Zig prefers snake_case for variable names (win_flag, not winFlag).
winFlag is also not a great name, considering its a flag that is applied to non-windows systems.
SOCK.STREAM shouldn't have been changed to SOCK.DGRAM; this is TCP.