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.websocket: allow timeout to be configured (#14941)

Browse Source
This commit is contained in:
Ken
2022-07-05 12:40:23 +09:00
committed by GitHub
parent 5523c11dd4
commit a50e0f0522
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/net/websocket/io.v
View File

@ -1,7 +1,6 @@
module websocket
import net
import time
// socket_read reads from socket into the provided buffer
fn (mut ws Client) socket_read(mut buffer []u8) ?int {
@ -13,15 +12,8 @@ fn (mut ws Client) socket_read(mut buffer []u8) ?int {
r := ws.ssl_conn.read(mut buffer)?
return r
} else {
for {
r := ws.conn.read(mut buffer) or {
if err.code() == net.err_timed_out_code {
continue
}
return err
}
return r
}
r := ws.conn.read(mut buffer)?
return r
}
}
return none
@ -37,15 +29,8 @@ fn (mut ws Client) socket_read_ptr(buf_ptr &u8, len int) ?int {
r := ws.ssl_conn.socket_read_into_ptr(buf_ptr, len)?
return r
} else {
for {
r := ws.conn.read_ptr(buf_ptr, len) or {
if err.code() == net.err_timed_out_code {
continue
}
return err
}
return r
}
r := ws.conn.read_ptr(buf_ptr, len)?
return r
}
}
return none
@ -91,8 +76,8 @@ fn (mut ws Client) dial_socket() ?&net.TcpConn {
mut t := net.dial_tcp(tcp_address)?
optval := int(1)
t.sock.set_option_int(.keep_alive, optval)?
t.set_read_timeout(30 * time.second)
t.set_write_timeout(30 * time.second)
t.set_read_timeout(ws.read_timeout)
t.set_write_timeout(ws.write_timeout)
if ws.is_ssl {
ws.ssl_conn.connect(mut t, ws.uri.hostname)?
}