ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 15:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Darwin MSG_NOSIGNAL to core:os

Browse Source
This commit is contained in:
Feoramund
2024-08-05 12:49:12 -04:00
parent eba0774bf3
commit 3512d7c672
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/net/socket_darwin.odin
+2 -6
View File
@@ -35,10 +35,6 @@ Socket_Option :: enum c.int {
Send_Timeout = c.int(os.SO_SNDTIMEO), Send_Timeout = c.int(os.SO_SNDTIMEO),
} }
// https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/socket.h#L1025-L1027
// Prevent the raising of SIGPIPE on writing to a closed network socket.
@private MSG_NOSIGNAL :: 0x80000
@(private) @(private)
_create_socket :: proc(family: Address_Family, protocol: Socket_Protocol) -> (socket: Any_Socket, err: Network_Error) { _create_socket :: proc(family: Address_Family, protocol: Socket_Protocol) -> (socket: Any_Socket, err: Network_Error) {
c_type, c_protocol, c_family: int c_type, c_protocol, c_family: int
@@ -198,7 +194,7 @@ _send_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_written: int, err: Net
for bytes_written < len(buf) { for bytes_written < len(buf) {
limit := min(int(max(i32)), len(buf) - bytes_written) limit := min(int(max(i32)), len(buf) - bytes_written)
remaining := buf[bytes_written:][:limit] remaining := buf[bytes_written:][:limit]
res, res_err := os.send(os.Socket(skt), remaining, MSG_NOSIGNAL) res, res_err := os.send(os.Socket(skt), remaining, os.MSG_NOSIGNAL)
if res_err != nil { if res_err != nil {
err = TCP_Send_Error(os.is_platform_error(res_err) or_else -1) err = TCP_Send_Error(os.is_platform_error(res_err) or_else -1)
return return
@@ -214,7 +210,7 @@ _send_udp :: proc(skt: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_written:
for bytes_written < len(buf) { for bytes_written < len(buf) {
limit := min(1<<31, len(buf) - bytes_written) limit := min(1<<31, len(buf) - bytes_written)
remaining := buf[bytes_written:][:limit] remaining := buf[bytes_written:][:limit]
res, res_err := os.sendto(os.Socket(skt), remaining, MSG_NOSIGNAL, cast(^os.SOCKADDR)&toaddr, i32(toaddr.len)) res, res_err := os.sendto(os.Socket(skt), remaining, os.MSG_NOSIGNAL, cast(^os.SOCKADDR)&toaddr, i32(toaddr.len))
if res_err != nil { if res_err != nil {
err = UDP_Send_Error(os.is_platform_error(res_err) or_else -1) err = UDP_Send_Error(os.is_platform_error(res_err) or_else -1)
return return
core/os/os_darwin.odin
+4
View File
@@ -492,6 +492,10 @@ in6_addr :: struct #packed {
s6_addr: [16]u8, s6_addr: [16]u8,
} }
// https://github.com/apple/darwin-xnu/blob/2ff845c2e033bd0ff64b5b6aa6063a1f8f65aa32/bsd/sys/socket.h#L1025-L1027
// Prevent the raising of SIGPIPE on writing to a closed network socket.
MSG_NOSIGNAL :: 0x80000
SIOCGIFFLAG :: enum c.int { SIOCGIFFLAG :: enum c.int {
UP = 0, /* Interface is up. */ UP = 0, /* Interface is up. */
BROADCAST = 1, /* Broadcast address valid. */ BROADCAST = 1, /* Broadcast address valid. */