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

x.websocket: fix autobahn tests for wss and wss close behavor (#6901)

Browse Source
This commit is contained in:
Tomas Hellström
2020-11-21 14:45:45 +01:00
committed by GitHub
parent b6099cd978
commit 155aa6dac5
20 changed files with 333 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/x/websocket/io.v
View File

@@ -11,6 +11,9 @@ interface WebsocketIO {
// socket_read reads into the provided buffer with its length
fn (mut ws Client) socket_read(mut buffer []byte) ?int {
lock {
if ws.state in [.closed, .closing] || ws.conn.sock.handle <= 1 {
return error('socket_read: trying to read a closed socket')
}
if ws.is_ssl {
r := ws.ssl_conn.read_into(mut buffer)?
return r
@@ -30,6 +33,10 @@ fn (mut ws Client) socket_read(mut buffer []byte) ?int {
fn (mut ws Client) socket_read_ptr(buf_ptr byteptr, len int) ?int {
lock {
if ws.state in [.closed, .closing] || ws.conn.sock.handle <= 1 {
return error('socket_read_ptr: trying to read a closed socket')
}
if ws.is_ssl {
r := ws.ssl_conn.socket_read_into_ptr(buf_ptr, len)?
return r
@@ -51,8 +58,8 @@ fn (mut ws Client) socket_read_ptr(buf_ptr byteptr, len int) ?int {
fn (mut ws Client) socket_write(bytes []byte) ? {
lock {
if ws.state == .closed || ws.conn.sock.handle <= 1 {
ws.debug_log('write: Socket allready closed')
return error('Socket allready closed')
ws.debug_log('socket_write: Socket allready closed')
return error('socket_write: trying to write on a closed socket')
}
if ws.is_ssl {
ws.ssl_conn.write(bytes)?