TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-09 15:27:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

net: add read_ptr/2 (from read/1) to UdpConn for consistency with TcpConn (#24000)

Browse Source
This commit is contained in:
larpon 2025-03-21 22:49:31 +01:00 committed by GitHub
parent 7bbe510a8d
commit bd064dd695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vlib/net/udp.c.v
View File

@ -94,16 +94,16 @@ pub fn (mut c UdpConn) write_to_string(addr Addr, s string) !int {
return c.write_to_ptr(addr, s.str, s.len) 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 // read_ptr reads from the socket into `buf_ptr` up to `len` bytes, returning the number of bytes read and the `Addr` read from.
pub fn (mut c UdpConn) read(mut buf []u8) !(int, Addr) { pub fn (c &UdpConn) read_ptr(buf_ptr &u8, len int) !(int, Addr) {
mut addr := Addr{ mut addr := Addr{
addr: AddrData{ addr: AddrData{
Ip6: Ip6{} Ip6: Ip6{}
} }
} }
len := sizeof(Addr) addr_len := sizeof(Addr)
mut res := wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf.data), buf.len, mut res := wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf_ptr), len, 0, voidptr(&addr),
0, voidptr(&addr), &len))! &addr_len))!
if res > 0 { if res > 0 {
return res, addr return res, addr
} }
@ -111,8 +111,8 @@ pub fn (mut c UdpConn) read(mut buf []u8) !(int, Addr) {
if code == int(error_ewouldblock) { if code == int(error_ewouldblock) {
c.wait_for_read()! c.wait_for_read()!
// same setup as in tcp // same setup as in tcp
res = wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf.data), buf.len, 0, res = wrap_read_result(C.recvfrom(c.sock.handle, voidptr(buf_ptr), len, 0, voidptr(&addr),
voidptr(&addr), &len))! &addr_len))!
res2 := socket_error(res)! res2 := socket_error(res)!
return res2, addr return res2, addr
} else { } else {
@ -121,6 +121,11 @@ pub fn (mut c UdpConn) read(mut buf []u8) !(int, Addr) {
return error('none') return error('none')
} }
// 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) {
return c.read_ptr(buf.data, buf.len)!
}
pub fn (c &UdpConn) read_deadline() !time.Time { pub fn (c &UdpConn) read_deadline() !time.Time {
if c.read_deadline.unix() == 0 { if c.read_deadline.unix() == 0 {
return c.read_deadline return c.read_deadline
@ -160,7 +165,7 @@ pub fn (mut c UdpConn) set_write_timeout(t time.Duration) {
} }
@[inline] @[inline]
pub fn (mut c UdpConn) wait_for_read() ! { pub fn (c &UdpConn) wait_for_read() ! {
return wait_for_read(c.sock.handle, c.read_deadline, c.read_timeout) return wait_for_read(c.sock.handle, c.read_deadline, c.read_timeout)
} }