mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: change optional to result of io (#16075)

Browse Source
This commit is contained in:
yuyi
2022-10-16 14:28:57 +08:00
committed by GitHub
parent 6e46933c55
commit f6844e9766
187 changed files with 1885 additions and 1874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
vlib/net/udp.v
View File

@ -27,8 +27,8 @@ mut:
write_timeout time.Duration
}
pub fn dial_udp(raddr string) ?&UdpConn {
addrs := resolve_addrs_fuzzy(raddr, .udp)?
pub fn dial_udp(raddr string) !&UdpConn {
addrs := resolve_addrs_fuzzy(raddr, .udp)!
for addr in addrs {
// create a local socket for this
@ -43,7 +43,7 @@ pub fn dial_udp(raddr string) ?&UdpConn {
}
}
return none
return error('none')
}
// pub fn dial_udp(laddr string, raddr string) ?&UdpConn {
@ -58,46 +58,46 @@ pub fn dial_udp(raddr string) ?&UdpConn {
// }
// }
pub fn (mut c UdpConn) write_ptr(b &u8, len int) ?int {
pub fn (mut c UdpConn) write_ptr(b &u8, len int) !int {
remote := c.sock.remote() or { return err_no_udp_remote }
return c.write_to_ptr(remote, b, len)
}
pub fn (mut c UdpConn) write(buf []u8) ?int {
pub fn (mut c UdpConn) write(buf []u8) !int {
return c.write_ptr(buf.data, buf.len)
}
pub fn (mut c UdpConn) write_string(s string) ?int {
pub fn (mut c UdpConn) write_string(s string) !int {
return c.write_ptr(s.str, s.len)
}
pub fn (mut c UdpConn) write_to_ptr(addr Addr, b &u8, len int) ?int {
pub fn (mut c UdpConn) write_to_ptr(addr Addr, b &u8, len int) !int {
res := C.sendto(c.sock.handle, b, len, 0, voidptr(&addr), addr.len())
if res >= 0 {
return res
}
code := error_code()
if code == int(error_ewouldblock) {
c.wait_for_write()?
socket_error(C.sendto(c.sock.handle, b, len, 0, voidptr(&addr), addr.len()))?
c.wait_for_write()!
socket_error(C.sendto(c.sock.handle, b, len, 0, voidptr(&addr), addr.len()))!
} else {
wrap_error(code)?
wrap_error(code)!
}
return none
return error('none')
}
// write_to blocks and writes the buf to the remote addr specified
pub fn (mut c UdpConn) write_to(addr Addr, buf []u8) ?int {
pub fn (mut c UdpConn) write_to(addr Addr, buf []u8) !int {
return c.write_to_ptr(addr, buf.data, buf.len)
}
// write_to_string blocks and writes the buf to the remote addr specified
pub fn (mut c UdpConn) write_to_string(addr Addr, s string) ?int {
pub fn (mut c UdpConn) write_to_string(addr Addr, s string) !int {
return c.write_to_ptr(addr, s.str, s.len)
}
// read reads from the socket into buf up to buf.len returning the number of bytes read
pub fn (mut c UdpConn) read(mut buf []u8) ?(int, Addr) {
pub fn (mut c UdpConn) read(mut buf []u8) !(int, Addr) {
mut addr := Addr{
addr: AddrData{
Ip6: Ip6{}
@ -105,40 +105,40 @@ pub fn (mut c UdpConn) read(mut buf []u8) ?(int, Addr) {
}
len := sizeof(Addr)
mut res := wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf.data), buf.len,
0, voidptr(&addr), &len))?
0, voidptr(&addr), &len))!
if res > 0 {
return res, addr
}
code := error_code()
if code == int(error_ewouldblock) {
c.wait_for_read()?
c.wait_for_read()!
// same setup as in tcp
res = wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf.data), buf.len, 0,
voidptr(&addr), &len))?
res2 := socket_error(res)?
voidptr(&addr), &len))!
res2 := socket_error(res)!
return res2, addr
} else {
wrap_error(code)?
wrap_error(code)!
}
return none
return error('none')
}
pub fn (c &UdpConn) read_deadline() ?time.Time {
pub fn (c &UdpConn) read_deadline() !time.Time {
if c.read_deadline.unix == 0 {
return c.read_deadline
}
return none
return error('none')
}
pub fn (mut c UdpConn) set_read_deadline(deadline time.Time) {
c.read_deadline = deadline
}
pub fn (c &UdpConn) write_deadline() ?time.Time {
pub fn (c &UdpConn) write_deadline() !time.Time {
if c.write_deadline.unix == 0 {
return c.write_deadline
}
return none
return error('none')
}
pub fn (mut c UdpConn) set_write_deadline(deadline time.Time) {
@ -162,12 +162,12 @@ pub fn (mut c UdpConn) set_write_timeout(t time.Duration) {
}
[inline]
pub fn (mut c UdpConn) wait_for_read() ? {
pub fn (mut c UdpConn) wait_for_read() ! {
return wait_for_read(c.sock.handle, c.read_deadline, c.read_timeout)
}
[inline]
pub fn (mut c UdpConn) wait_for_write() ? {
pub fn (mut c UdpConn) wait_for_write() ! {
return wait_for_write(c.sock.handle, c.write_deadline, c.write_timeout)
}
@ -176,27 +176,27 @@ pub fn (c &UdpConn) str() string {
return 'UdpConn'
}
pub fn (mut c UdpConn) close() ? {
pub fn (mut c UdpConn) close() ! {
return c.sock.close()
}
pub fn listen_udp(laddr string) ?&UdpConn {
addrs := resolve_addrs_fuzzy(laddr, .udp)?
pub fn listen_udp(laddr string) !&UdpConn {
addrs := resolve_addrs_fuzzy(laddr, .udp)!
// TODO(emily):
// here we are binding to the first address
// and that is probably not ideal
addr := addrs[0]
return &UdpConn{
sock: new_udp_socket(addr)?
sock: new_udp_socket(addr)!
read_timeout: net.udp_default_read_timeout
write_timeout: net.udp_default_write_timeout
}
}
fn new_udp_socket(local_addr Addr) ?&UdpSocket {
fn new_udp_socket(local_addr Addr) !&UdpSocket {
family := local_addr.family()
sockfd := socket_error(C.socket(family, SocketType.udp, 0))?
sockfd := socket_error(C.socket(family, SocketType.udp, 0))!
mut s := &UdpSocket{
handle: sockfd
l: local_addr
@ -207,28 +207,28 @@ fn new_udp_socket(local_addr Addr) ?&UdpSocket {
}
}
s.set_option_bool(.reuse_addr, true)?
s.set_option_bool(.reuse_addr, true)!
if family == .ip6 {
s.set_dualstack(true)?
s.set_dualstack(true)!
}
$if !net_blocking_sockets ? {
// NOTE: refer to comments in tcp.v
$if windows {
t := u32(1) // true
socket_error(C.ioctlsocket(sockfd, fionbio, &t))?
socket_error(C.ioctlsocket(sockfd, fionbio, &t))!
} $else {
socket_error(C.fcntl(sockfd, C.F_SETFD, C.O_NONBLOCK))?
socket_error(C.fcntl(sockfd, C.F_SETFD, C.O_NONBLOCK))!
}
}
// cast to the correct type
socket_error(C.bind(s.handle, voidptr(&local_addr), local_addr.len()))?
socket_error(C.bind(s.handle, voidptr(&local_addr), local_addr.len()))!
return s
}
fn new_udp_socket_for_remote(raddr Addr) ?&UdpSocket {
fn new_udp_socket_for_remote(raddr Addr) !&UdpSocket {
// Invent a sutible local address for this remote addr
// Appease compiler
mut addr := Addr{
@ -246,20 +246,20 @@ fn new_udp_socket_for_remote(raddr Addr) ?&UdpSocket {
addr = new_ip6(0, addr_ip6_any)
}
.unix {
addr = temp_unix()?
addr = temp_unix()!
}
else {
panic('Invalid family')
}
}
mut sock := new_udp_socket(addr)?
mut sock := new_udp_socket(addr)!
sock.has_r = true
sock.r = raddr
return sock
}
pub fn (mut s UdpSocket) set_option_bool(opt SocketOption, value bool) ? {
pub fn (mut s UdpSocket) set_option_bool(opt SocketOption, value bool) ! {
// TODO reenable when this `in` operation works again
// if opt !in opts_can_set {
// return err_option_not_settable
@ -268,26 +268,26 @@ pub fn (mut s UdpSocket) set_option_bool(opt SocketOption, value bool) ? {
// return err_option_wrong_type
// }
x := int(value)
socket_error(C.setsockopt(s.handle, C.SOL_SOCKET, int(opt), &x, sizeof(int)))?
socket_error(C.setsockopt(s.handle, C.SOL_SOCKET, int(opt), &x, sizeof(int)))!
}
pub fn (mut s UdpSocket) set_dualstack(on bool) ? {
pub fn (mut s UdpSocket) set_dualstack(on bool) ! {
x := int(!on)
socket_error(C.setsockopt(s.handle, C.IPPROTO_IPV6, int(SocketOption.ipv6_only), &x,
sizeof(int)))?
sizeof(int)))!
}
fn (mut s UdpSocket) close() ? {
fn (mut s UdpSocket) close() ! {
return shutdown(s.handle)
}
fn (mut s UdpSocket) @select(test Select, timeout time.Duration) ?bool {
fn (mut s UdpSocket) @select(test Select, timeout time.Duration) !bool {
return @select(s.handle, test, timeout)
}
fn (s &UdpSocket) remote() ?Addr {
fn (s &UdpSocket) remote() !Addr {
if s.has_r {
return s.r
}
return none
return error('none')
}