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

Finish cleaning up core_net.

Browse Source
This commit is contained in:
Jeroen van Rijn
2023-03-03 17:26:44 +01:00
parent 5da5ebff13
commit 5c05038af0
3 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/net/socket_darwin.odin
+35 -28
View File
@@ -22,8 +22,6 @@ import "core:c"
import "core:os" import "core:os"
import "core:time" import "core:time"
Platform_Socket :: os.Socket
Socket_Option :: enum c.int { Socket_Option :: enum c.int {
Reuse_Address = c.int(os.SO_REUSEADDR), Reuse_Address = c.int(os.SO_REUSEADDR),
Keep_Alive = c.int(os.SO_KEEPALIVE), Keep_Alive = c.int(os.SO_KEEPALIVE),
@@ -36,7 +34,8 @@ Socket_Option :: enum c.int {
Send_Timeout = c.int(os.SO_SNDTIMEO), Send_Timeout = c.int(os.SO_SNDTIMEO),
} }
create_socket :: proc(family: Address_Family, protocol: Socket_Protocol) -> (socket: Any_Socket, err: Network_Error) { @(private)
_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
switch family { switch family {
@@ -67,7 +66,8 @@ create_socket :: proc(family: Address_Family, protocol: Socket_Protocol) -> (soc
} }
} }
dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_options) -> (skt: TCP_Socket, err: Network_Error) { @(private)
_dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_options) -> (skt: TCP_Socket, err: Network_Error) {
if endpoint.port == 0 { if endpoint.port == 0 {
return 0, .Port_Required return 0, .Port_Required
} }
@@ -82,7 +82,7 @@ dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_option
_ = set_option(skt, .Reuse_Address, true) _ = set_option(skt, .Reuse_Address, true)
sockaddr := _endpoint_to_sockaddr(endpoint) sockaddr := _endpoint_to_sockaddr(endpoint)
res := os.connect(Platform_Socket(skt), (^os.SOCKADDR)(&sockaddr), i32(sockaddr.len)) res := os.connect(os.Socket(skt), (^os.SOCKADDR)(&sockaddr), i32(sockaddr.len))
if res != os.ERROR_NONE { if res != os.ERROR_NONE {
err = Dial_Error(res) err = Dial_Error(res)
return return
@@ -91,17 +91,19 @@ dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_option
return return
} }
bind :: proc(skt: Any_Socket, ep: Endpoint) -> (err: Network_Error) { @(private)
_bind :: proc(skt: Any_Socket, ep: Endpoint) -> (err: Network_Error) {
sockaddr := _endpoint_to_sockaddr(ep) sockaddr := _endpoint_to_sockaddr(ep)
s := any_socket_to_socket(skt) s := any_socket_to_socket(skt)
res := os.bind(Platform_Socket(s), (^os.SOCKADDR)(&sockaddr), i32(sockaddr.len)) res := os.bind(os.Socket(s), (^os.SOCKADDR)(&sockaddr), i32(sockaddr.len))
if res != os.ERROR_NONE { if res != os.ERROR_NONE {
err = Bind_Error(res) err = Bind_Error(res)
} }
return return
} }
listen_tcp :: proc(interface_endpoint: Endpoint, backlog := 1000) -> (skt: TCP_Socket, err: Network_Error) { @(private)
_listen_tcp :: proc(interface_endpoint: Endpoint, backlog := 1000) -> (skt: TCP_Socket, err: Network_Error) {
assert(backlog > 0 && i32(backlog) < max(i32)) assert(backlog > 0 && i32(backlog) < max(i32))
family := family_from_endpoint(interface_endpoint) family := family_from_endpoint(interface_endpoint)
@@ -117,7 +119,7 @@ listen_tcp :: proc(interface_endpoint: Endpoint, backlog := 1000) -> (skt: TCP_S
bind(sock, interface_endpoint) or_return bind(sock, interface_endpoint) or_return
res := os.listen(Platform_Socket(skt), backlog) res := os.listen(os.Socket(skt), backlog)
if res != os.ERROR_NONE { if res != os.ERROR_NONE {
err = Listen_Error(res) err = Listen_Error(res)
return return
@@ -126,11 +128,12 @@ listen_tcp :: proc(interface_endpoint: Endpoint, backlog := 1000) -> (skt: TCP_S
return return
} }
accept_tcp :: proc(sock: TCP_Socket) -> (client: TCP_Socket, source: Endpoint, err: Network_Error) { @(private)
_accept_tcp :: proc(sock: TCP_Socket, options := default_tcp_options) -> (client: TCP_Socket, source: Endpoint, err: Network_Error) {
sockaddr: os.SOCKADDR_STORAGE_LH sockaddr: os.SOCKADDR_STORAGE_LH
sockaddrlen := c.int(size_of(sockaddr)) sockaddrlen := c.int(size_of(sockaddr))
client_sock, ok := os.accept(Platform_Socket(sock), cast(^os.SOCKADDR) &sockaddr, &sockaddrlen) client_sock, ok := os.accept(os.Socket(sock), cast(^os.SOCKADDR) &sockaddr, &sockaddrlen)
if ok != os.ERROR_NONE { if ok != os.ERROR_NONE {
err = Accept_Error(ok) err = Accept_Error(ok)
return return
@@ -140,16 +143,18 @@ accept_tcp :: proc(sock: TCP_Socket) -> (client: TCP_Socket, source: Endpoint, e
return return
} }
close :: proc(skt: Any_Socket) { @(private)
_close :: proc(skt: Any_Socket) {
s := any_socket_to_socket(skt) s := any_socket_to_socket(skt)
os.close(os.Handle(Platform_Socket(s))) os.close(os.Handle(os.Socket(s)))
} }
recv_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_read: int, err: Network_Error) { @(private)
_recv_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_read: int, err: Network_Error) {
if len(buf) <= 0 { if len(buf) <= 0 {
return return
} }
res, ok := os.recv(Platform_Socket(skt), buf, 0) res, ok := os.recv(os.Socket(skt), buf, 0)
if ok != os.ERROR_NONE { if ok != os.ERROR_NONE {
err = TCP_Recv_Error(ok) err = TCP_Recv_Error(ok)
return return
@@ -157,14 +162,15 @@ recv_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_read: int, err: Network
return int(res), nil return int(res), nil
} }
recv_udp :: proc(skt: UDP_Socket, buf: []byte) -> (bytes_read: int, remote_endpoint: Endpoint, err: Network_Error) { @(private)
_recv_udp :: proc(skt: UDP_Socket, buf: []byte) -> (bytes_read: int, remote_endpoint: Endpoint, err: Network_Error) {
if len(buf) <= 0 { if len(buf) <= 0 {
return return
} }
from: os.SOCKADDR_STORAGE_LH from: os.SOCKADDR_STORAGE_LH
fromsize := c.int(size_of(from)) fromsize := c.int(size_of(from))
res, ok := os.recvfrom(Platform_Socket(skt), buf, 0, cast(^os.SOCKADDR) &from, &fromsize) res, ok := os.recvfrom(os.Socket(skt), buf, 0, cast(^os.SOCKADDR) &from, &fromsize)
if ok != os.ERROR_NONE { if ok != os.ERROR_NONE {
err = UDP_Recv_Error(ok) err = UDP_Recv_Error(ok)
return return
@@ -175,14 +181,12 @@ recv_udp :: proc(skt: UDP_Socket, buf: []byte) -> (bytes_read: int, remote_endpo
return return
} }
// Repeatedly sends data until the entire buffer is sent. @(private)
// If a send fails before all data is sent, returns the amount _send_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_written: int, err: Network_Error) {
// sent up to that point.
send_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_written: int, err: Network_Error) {
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, ok := os.send(Platform_Socket(skt), remaining, 0) res, ok := os.send(os.Socket(skt), remaining, 0)
if ok != os.ERROR_NONE { if ok != os.ERROR_NONE {
err = TCP_Send_Error(ok) err = TCP_Send_Error(ok)
return return
@@ -192,12 +196,13 @@ send_tcp :: proc(skt: TCP_Socket, buf: []byte) -> (bytes_written: int, err: Netw
return return
} }
send_udp :: proc(skt: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_written: int, err: Network_Error) { @(private)
_send_udp :: proc(skt: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_written: int, err: Network_Error) {
toaddr := _endpoint_to_sockaddr(to) toaddr := _endpoint_to_sockaddr(to)
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, ok := os.sendto(Platform_Socket(skt), remaining, 0, cast(^os.SOCKADDR)&toaddr, i32(toaddr.len)) res, ok := os.sendto(os.Socket(skt), remaining, 0, cast(^os.SOCKADDR)&toaddr, i32(toaddr.len))
if ok != os.ERROR_NONE { if ok != os.ERROR_NONE {
err = UDP_Send_Error(ok) err = UDP_Send_Error(ok)
return return
@@ -207,16 +212,18 @@ send_udp :: proc(skt: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_written:
return return
} }
shutdown :: proc(skt: Any_Socket, manner: Shutdown_Manner) -> (err: Network_Error) { @(private)
_shutdown :: proc(skt: Any_Socket, manner: Shutdown_Manner) -> (err: Network_Error) {
s := any_socket_to_socket(skt) s := any_socket_to_socket(skt)
res := os.shutdown(Platform_Socket(s), int(manner)) res := os.shutdown(os.Socket(s), int(manner))
if res != os.ERROR_NONE { if res != os.ERROR_NONE {
return Shutdown_Error(res) return Shutdown_Error(res)
} }
return return
} }
set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #caller_location) -> Network_Error { @(private)
_set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #caller_location) -> Network_Error {
level := os.SOL_SOCKET if option != .TCP_Nodelay else os.IPPROTO_TCP level := os.SOL_SOCKET if option != .TCP_Nodelay else os.IPPROTO_TCP
// NOTE(tetra, 2022-02-15): On Linux, you cannot merely give a single byte for a bool; // NOTE(tetra, 2022-02-15): On Linux, you cannot merely give a single byte for a bool;
@@ -286,7 +293,7 @@ set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #cal
} }
skt := any_socket_to_socket(s) skt := any_socket_to_socket(s)
res := os.setsockopt(Platform_Socket(skt), int(level), int(option), ptr, len) res := os.setsockopt(os.Socket(skt), int(level), int(option), ptr, len)
if res != os.ERROR_NONE { if res != os.ERROR_NONE {
return Socket_Option_Error(res) return Socket_Option_Error(res)
} }
core/net/socket_windows.odin
+12 -14
View File
@@ -22,8 +22,6 @@ import "core:c"
import win "core:sys/windows" import win "core:sys/windows"
import "core:time" import "core:time"
Platform_Socket :: win.SOCKET
@(init, private) @(init, private)
ensure_winsock_initialized :: proc() { ensure_winsock_initialized :: proc() {
win.ensure_winsock_initialized() win.ensure_winsock_initialized()
@@ -78,7 +76,7 @@ _dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_optio
_ = set_option(socket, .Reuse_Address, true) _ = set_option(socket, .Reuse_Address, true)
sockaddr := _endpoint_to_sockaddr(endpoint) sockaddr := _endpoint_to_sockaddr(endpoint)
res := win.connect(Platform_Socket(socket), &sockaddr, size_of(sockaddr)) res := win.connect(win.SOCKET(socket), &sockaddr, size_of(sockaddr))
if res < 0 { if res < 0 {
err = Dial_Error(win.WSAGetLastError()) err = Dial_Error(win.WSAGetLastError())
return return
@@ -94,8 +92,8 @@ _dial_tcp_from_endpoint :: proc(endpoint: Endpoint, options := default_tcp_optio
@(private) @(private)
_bind :: proc(socket: Any_Socket, ep: Endpoint) -> (err: Network_Error) { _bind :: proc(socket: Any_Socket, ep: Endpoint) -> (err: Network_Error) {
sockaddr := _endpoint_to_sockaddr(ep) sockaddr := _endpoint_to_sockaddr(ep)
s := any_socket_to_socket(socket) sock := any_socket_to_socket(socket)
res := win.bind(Platform_Socket(s), &sockaddr, size_of(sockaddr)) res := win.bind(win.SOCKET(sock), &sockaddr, size_of(sockaddr))
if res < 0 { if res < 0 {
err = Bind_Error(win.WSAGetLastError()) err = Bind_Error(win.WSAGetLastError())
} }
@@ -114,7 +112,7 @@ _listen_tcp :: proc(interface_endpoint: Endpoint, backlog := 1000) -> (socket: T
bind(sock, interface_endpoint) or_return bind(sock, interface_endpoint) or_return
if res := win.listen(Platform_Socket(socket), i32(backlog)); res == win.SOCKET_ERROR { if res := win.listen(win.SOCKET(socket), i32(backlog)); res == win.SOCKET_ERROR {
err = Listen_Error(win.WSAGetLastError()) err = Listen_Error(win.WSAGetLastError())
} }
return return
@@ -125,7 +123,7 @@ _accept_tcp :: proc(sock: TCP_Socket, options := default_tcp_options) -> (client
for { for {
sockaddr: win.SOCKADDR_STORAGE_LH sockaddr: win.SOCKADDR_STORAGE_LH
sockaddrlen := c.int(size_of(sockaddr)) sockaddrlen := c.int(size_of(sockaddr))
client_sock := win.accept(Platform_Socket(sock), &sockaddr, &sockaddrlen) client_sock := win.accept(win.SOCKET(sock), &sockaddr, &sockaddrlen)
if int(client_sock) == win.SOCKET_ERROR { if int(client_sock) == win.SOCKET_ERROR {
e := win.WSAGetLastError() e := win.WSAGetLastError()
if e == win.WSAECONNRESET { if e == win.WSAECONNRESET {
@@ -150,7 +148,7 @@ _accept_tcp :: proc(sock: TCP_Socket, options := default_tcp_options) -> (client
@(private) @(private)
_close :: proc(socket: Any_Socket) { _close :: proc(socket: Any_Socket) {
if s := any_socket_to_socket(socket); s != {} { if s := any_socket_to_socket(socket); s != {} {
win.closesocket(Platform_Socket(s)) win.closesocket(win.SOCKET(s))
} }
} }
@@ -159,7 +157,7 @@ _recv_tcp :: proc(socket: TCP_Socket, buf: []byte) -> (bytes_read: int, err: Net
if len(buf) <= 0 { if len(buf) <= 0 {
return return
} }
res := win.recv(Platform_Socket(socket), raw_data(buf), c.int(len(buf)), 0) res := win.recv(win.SOCKET(socket), raw_data(buf), c.int(len(buf)), 0)
if res < 0 { if res < 0 {
err = TCP_Recv_Error(win.WSAGetLastError()) err = TCP_Recv_Error(win.WSAGetLastError())
return return
@@ -175,7 +173,7 @@ _recv_udp :: proc(socket: UDP_Socket, buf: []byte) -> (bytes_read: int, remote_e
from: win.SOCKADDR_STORAGE_LH from: win.SOCKADDR_STORAGE_LH
fromsize := c.int(size_of(from)) fromsize := c.int(size_of(from))
res := win.recvfrom(Platform_Socket(socket), raw_data(buf), c.int(len(buf)), 0, &from, &fromsize) res := win.recvfrom(win.SOCKET(socket), raw_data(buf), c.int(len(buf)), 0, &from, &fromsize)
if res < 0 { if res < 0 {
err = UDP_Recv_Error(win.WSAGetLastError()) err = UDP_Recv_Error(win.WSAGetLastError())
return return
@@ -191,7 +189,7 @@ _send_tcp :: proc(socket: TCP_Socket, buf: []byte) -> (bytes_written: int, err:
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:] remaining := buf[bytes_written:]
res := win.send(Platform_Socket(socket), raw_data(remaining), c.int(limit), 0) res := win.send(win.SOCKET(socket), raw_data(remaining), c.int(limit), 0)
if res < 0 { if res < 0 {
err = TCP_Send_Error(win.WSAGetLastError()) err = TCP_Send_Error(win.WSAGetLastError())
return return
@@ -209,7 +207,7 @@ _send_udp :: proc(socket: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_writt
return return
} }
toaddr := _endpoint_to_sockaddr(to) toaddr := _endpoint_to_sockaddr(to)
res := win.sendto(Platform_Socket(socket), raw_data(buf), c.int(len(buf)), 0, &toaddr, size_of(toaddr)) res := win.sendto(win.SOCKET(socket), raw_data(buf), c.int(len(buf)), 0, &toaddr, size_of(toaddr))
if res < 0 { if res < 0 {
err = UDP_Send_Error(win.WSAGetLastError()) err = UDP_Send_Error(win.WSAGetLastError())
return return
@@ -221,7 +219,7 @@ _send_udp :: proc(socket: UDP_Socket, buf: []byte, to: Endpoint) -> (bytes_writt
@(private) @(private)
_shutdown :: proc(socket: Any_Socket, manner: Shutdown_Manner) -> (err: Network_Error) { _shutdown :: proc(socket: Any_Socket, manner: Shutdown_Manner) -> (err: Network_Error) {
s := any_socket_to_socket(socket) s := any_socket_to_socket(socket)
res := win.shutdown(Platform_Socket(s), c.int(manner)) res := win.shutdown(win.SOCKET(s), c.int(manner))
if res < 0 { if res < 0 {
return Shutdown_Error(win.WSAGetLastError()) return Shutdown_Error(win.WSAGetLastError())
} }
@@ -304,7 +302,7 @@ _set_option :: proc(s: Any_Socket, option: Socket_Option, value: any, loc := #ca
} }
socket := any_socket_to_socket(s) socket := any_socket_to_socket(s)
res := win.setsockopt(Platform_Socket(socket), c.int(level), c.int(option), ptr, len) res := win.setsockopt(win.SOCKET(socket), c.int(level), c.int(option), ptr, len)
if res < 0 { if res < 0 {
return Socket_Option_Error(win.WSAGetLastError()) return Socket_Option_Error(win.WSAGetLastError())
} }
tests/core/net/test_core_net.odin
+2 -2
View File
@@ -338,8 +338,8 @@ ENDPOINT := net.Endpoint{
CONTENT := "Hellope!" CONTENT := "Hellope!"
SEND_TIMEOUT :: time.Duration(2 * time.Second) SEND_TIMEOUT :: time.Duration(1 * time.Second)
RECV_TIMEOUT :: time.Duration(2 * time.Second) RECV_TIMEOUT :: time.Duration(1 * time.Second)
Thread_Data :: struct { Thread_Data :: struct {
skt: net.Any_Socket, skt: net.Any_Socket,