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

test-cleancode: add the rest of vlib/x/websocket/

Browse Source
This commit is contained in:
Delyan Angelov
2020-12-28 07:25:46 +02:00
parent b65353794c
commit b7a5dbf7b4
10 changed files with 67 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/x/websocket/handshake.v
View File

@ -30,14 +30,14 @@ fn (mut ws Client) handshake() ? {
ws.debug_log('sending handshake: $handshake')
ws.socket_write(handshake_bytes) ?
ws.read_handshake(seckey) ?
unsafe {handshake_bytes.free()}
unsafe { handshake_bytes.free() }
}
// handle_server_handshake manages websocket server handshake process
fn (mut s Server) handle_server_handshake(mut c Client) ?(string, &ServerClient) {
msg := c.read_handshake_str() ?
handshake_response, client := s.parse_client_handshake(msg, mut c) ?
unsafe {msg.free()}
unsafe { msg.free() }
return handshake_response, client
}
@ -83,7 +83,7 @@ fn (mut s Server) parse_client_handshake(client_handshake string, mut c Client)
// we ignore other headers like protocol for now
}
}
unsafe {keys.free()}
unsafe { keys.free() }
}
if flags.len < 3 {
return error_with_code('invalid client handshake, $client_handshake', 4)
@ -130,7 +130,7 @@ fn (mut ws Client) read_handshake_str() ?string {
fn (mut ws Client) read_handshake(seckey string) ? {
mut msg := ws.read_handshake_str() ?
ws.check_handshake_response(msg, seckey) ?
unsafe {msg.free()}
unsafe { msg.free() }
}
// check_handshake_response checks the response from handshake and returns
@ -164,13 +164,13 @@ fn (mut ws Client) check_handshake_response(handshake_response string, seckey st
7)
}
ws.flags << .has_accept
unsafe {challenge.free()}
unsafe { challenge.free() }
}
else {}
}
unsafe {keys.free()}
unsafe { keys.free() }
}
unsafe {lines.free()}
unsafe { lines.free() }
if ws.flags.len < 3 {
ws.close(1002, 'invalid websocket HTTP headers') ?
return error_with_code('invalid websocket HTTP headers', 8)