umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Add {close, StatusCode, Payload} and fix {close, Payload}

Browse source
This commit is contained in:
Loïc Hoguin 2012-12-08 19:11:56 +01:00
parent d2ccd2e090
commit 6d4e15705f
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/cowboy_websocket.erl
View file

@ -22,7 +22,8 @@
-export([handler_loop/4]). -export([handler_loop/4]).
-type frame() :: close | ping | pong -type frame() :: close | ping | pong
| {text | binary | close | ping | pong, binary()}. | {text | binary | close | ping | pong, binary()}
| {close, 1000..4999, binary()}.
-export_type([frame/0]). -export_type([frame/0]).
-type opcode() :: 0 | 1 | 2 | 8 | 9 | 10. -type opcode() :: 0 | 1 | 2 | 8 | 9 | 10.
@ -541,22 +542,30 @@ websocket_send(Type, #state{socket=Socket, transport=Transport})
when Type =:= ping; Type =:= pong -> when Type =:= ping; Type =:= pong ->
Opcode = websocket_opcode(Type), Opcode = websocket_opcode(Type),
Transport:send(Socket, << 1:1, 0:3, Opcode:4, 0:8 >>); Transport:send(Socket, << 1:1, 0:3, Opcode:4, 0:8 >>);
websocket_send({close, Payload}, State) ->
websocket_send({close, 1000, Payload}, State);
websocket_send({Type = close, StatusCode, Payload}, #state{
socket=Socket, transport=Transport}) ->
Opcode = websocket_opcode(Type),
Len = 2 + iolist_size(Payload),
%% Control packets must not be > 125 in length.
true = Len =< 125,
BinLen = hybi_payload_length(Len),
Transport:send(Socket,
[<< 1:1, 0:3, Opcode:4, 0:1, BinLen/bits, StatusCode:16 >>, Payload]),
shutdown;
websocket_send({Type, Payload}, #state{socket=Socket, transport=Transport}) -> websocket_send({Type, Payload}, #state{socket=Socket, transport=Transport}) ->
Opcode = websocket_opcode(Type), Opcode = websocket_opcode(Type),
Len = iolist_size(Payload), Len = iolist_size(Payload),
%% Control packets must not be > 125 in length. %% Control packets must not be > 125 in length.
true = if Type =:= close; Type =:= ping; Type =:= pong -> true = if Type =:= ping; Type =:= pong ->
Len =< 125; Len =< 125;
true -> true ->
true true
end, end,
BinLen = hybi_payload_length(Len), BinLen = hybi_payload_length(Len),
Ret = Transport:send(Socket, Transport:send(Socket,
[<< 1:1, 0:3, Opcode:4, 0:1, BinLen/bits >>, Payload]), [<< 1:1, 0:3, Opcode:4, 0:1, BinLen/bits >>, Payload]).
case Type of
close -> shutdown;
_ -> Ret
end.
-spec websocket_send_many([frame()], #state{}) -spec websocket_send_many([frame()], #state{})
-> ok | shutdown | {error, atom()}. -> ok | shutdown | {error, atom()}.

6
test/ws_SUITE.erl
View file

@ -106,7 +106,7 @@ init_dispatch() ->
{[<<"ws_send_close_payload">>], ws_send_many_handler, [ {[<<"ws_send_close_payload">>], ws_send_many_handler, [
{sequence, [ {sequence, [
{text, <<"send">>}, {text, <<"send">>},
{close, <<"some text!">>}, {close, 1001, <<"some text!">>},
{text, <<"won't be received">>}]} {text, <<"won't be received">>}]}
]}, ]},
{[<<"ws_timeout_hibernate">>], ws_timeout_hibernate_handler, []}, {[<<"ws_timeout_hibernate">>], ws_timeout_hibernate_handler, []},
@ -387,9 +387,9 @@ ws_send_close_payload(Config) ->
{"sec-websocket-accept", "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="} {"sec-websocket-accept", "s3pPLMBiTxaQ9kYGzzhZRbK+xOo="}
= lists:keyfind("sec-websocket-accept", 1, Headers), = lists:keyfind("sec-websocket-accept", 1, Headers),
%% We catch all frames at once and check them directly. %% We catch all frames at once and check them directly.
{ok, Many} = gen_tcp:recv(Socket, 18, 6000), {ok, Many} = gen_tcp:recv(Socket, 20, 6000),
<< 1:1, 0:3, 1:4, 0:1, 4:7, "send", << 1:1, 0:3, 1:4, 0:1, 4:7, "send",
1:1, 0:3, 8:4, 0:1, 10:7, "some text!" >> = Many, 1:1, 0:3, 8:4, 0:1, 12:7, 1001:16, "some text!" >> = Many,
{error, closed} = gen_tcp:recv(Socket, 0, 6000), {error, closed} = gen_tcp:recv(Socket, 0, 6000),
ok. ok.