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

net: ipv6 support, merge unix+ip;[pack:x] attribute (#9904)

Browse Source
This commit is contained in:
Emily Hudson
2021-06-13 21:53:38 +01:00
committed by GitHub
parent fa9fa77a5f
commit 535dcac8fa
52 changed files with 1277 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vlib/net/unix/stream_nix.v
View File

@ -41,8 +41,7 @@ fn error_code() int {
}
fn new_stream_socket() ?StreamSocket {
sockfd := net.socket_error(C.socket(net.SocketFamily.unix, net.SocketType.stream,
0)) ?
sockfd := net.socket_error(C.socket(net.AddrFamily.unix, net.SocketType.tcp, 0)) ?
mut s := StreamSocket{
handle: sockfd
}
@ -67,19 +66,18 @@ fn (mut s StreamSocket) connect(a string) ? {
addr.sun_family = C.AF_UNIX
unsafe { C.strncpy(&addr.sun_path[0], &char(a.str), max_sun_path) }
size := C.SUN_LEN(&addr)
sockaddr := unsafe { &C.sockaddr(&addr) }
res := C.connect(s.handle, sockaddr, size)
res := C.connect(s.handle, voidptr(&addr), size)
// if res != 1 {
// return none
//}
if res == 0 {
return none
return
}
_ := error_code()
write_result := s.@select(.write, unix.connect_timeout) ?
if write_result {
// succeeded
return none
return
}
except_result := s.@select(.except, unix.connect_timeout) ?
if except_result {
@ -100,8 +98,7 @@ pub fn listen_stream(sock string) ?&StreamListener {
addr.sun_family = C.AF_UNIX
unsafe { C.strncpy(&addr.sun_path[0], &char(sock.str), max_sun_path) }
size := C.SUN_LEN(&addr)
sockaddr := unsafe { &C.sockaddr(&addr) }
net.socket_error(C.bind(s.handle, sockaddr, size)) ?
net.socket_error(C.bind(s.handle, voidptr(&addr), size)) ?
net.socket_error(C.listen(s.handle, 128)) ?
return &StreamListener{
sock: s
@ -124,7 +121,7 @@ pub fn (mut l StreamListener) accept() ?&StreamConn {
l.wait_for_accept() ?
new_handle = C.accept(l.sock.handle, 0, 0)
if new_handle == -1 || new_handle == 0 {
return none
return error('accept failed')
}
}
new_sock := StreamSocket{
@ -141,7 +138,7 @@ pub fn (c &StreamListener) accept_deadline() ?time.Time {
if c.accept_deadline.unix != 0 {
return c.accept_deadline
}
return none
return error('no deadline')
}
pub fn (mut c StreamListener) set_accept_deadline(deadline time.Time) {
@ -162,12 +159,10 @@ pub fn (mut c StreamListener) wait_for_accept() ? {
pub fn (mut c StreamListener) close() ? {
c.sock.close() ?
return none
}
pub fn (mut c StreamConn) close() ? {
c.sock.close() ?
return none
}
// write_ptr blocks and attempts to write all data
@ -216,7 +211,7 @@ pub fn (mut c StreamConn) write_string(s string) ?int {
}
pub fn (mut c StreamConn) read_ptr(buf_ptr &byte, len int) ?int {
mut res := wrap_read_result(C.recv(c.sock.handle, buf_ptr, len, 0)) ?
mut res := wrap_read_result(C.recv(c.sock.handle, voidptr(buf_ptr), len, 0)) ?
$if trace_unix ? {
eprintln('<<< StreamConn.read_ptr | c.sock.handle: $c.sock.handle | buf_ptr: ${ptr_str(buf_ptr)} len: $len | res: $res')
}
@ -226,7 +221,7 @@ pub fn (mut c StreamConn) read_ptr(buf_ptr &byte, len int) ?int {
code := error_code()
if code == int(error_ewouldblock) {
c.wait_for_read() ?
res = wrap_read_result(C.recv(c.sock.handle, buf_ptr, len, 0)) ?
res = wrap_read_result(C.recv(c.sock.handle, voidptr(buf_ptr), len, 0)) ?
$if trace_unix ? {
eprintln('<<< StreamConn.read_ptr | c.sock.handle: $c.sock.handle | buf_ptr: ${ptr_str(buf_ptr)} len: $len | res: $res')
}
@ -234,7 +229,7 @@ pub fn (mut c StreamConn) read_ptr(buf_ptr &byte, len int) ?int {
} else {
net.wrap_error(code) ?
}
return none
return net.socket_error(code)
}
pub fn (mut c StreamConn) read(mut buf []byte) ?int {