Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-09-29 14:37:44 +02:00
Code Releases Activity

Properly handle close op in websocket

Browse Source
This commit is contained in:
Paweł Chmielowski 2012-09-14 10:05:42 +02:00
parent 02eeebd41a
commit 2f7c69fd14
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/web/ejabberd_websocket.erl
View File

@ -413,16 +413,35 @@ process_hybi_8(#hybi_8_state{unprocessed = none,
{State3, Recv, Send} = process_hybi_8(#hybi_8_state{}, {State3, Recv, Send} = process_hybi_8(#hybi_8_state{},
Unprocessed), Unprocessed),
case Opcode of case Opcode of
9 ->
Frame = encode_frame({'draft-hybi', 8}, Unprocessed,
10),
{State3#hybi_8_state{unmasked_msg = UnmaskedMsg}, Recv,
[Frame | Send]};
X when X < 3 -> X when X < 3 ->
{State3, {State3,
[iolist_to_binary([UnmaskedMsg, UnmaskedPre, Unmasked]) [iolist_to_binary([UnmaskedMsg, UnmaskedPre, Unmasked])
| Recv], | Recv],
Send}; Send};
9 -> % Ping
Frame = encode_frame({'draft-hybi', 8}, Unprocessed,
10),
{State3#hybi_8_state{unmasked_msg = UnmaskedMsg}, Recv,
[Frame | Send]};
8 -> % Close
CloseCode = case Unmasked of
<<Code:16/integer-big, Message/binary>> ->
?DEBUG("WebSocket close op: ~p ~s",
[Code, Message]),
Code;
<<Code:16/integer-big>> ->
?DEBUG("WebSocket close op: ~p", [Code]),
Code;
_ ->
?DEBUG("WebSocket close op unknown: ~p",
[Unmasked]),
1000
end,
Frame = encode_frame({'draft-hybi', 8},
<<CloseCode:16/integer-big>>, 8),
{State3#hybi_8_state{unmasked_msg=UnmaskedMsg}, Recv,
[Frame | Send]};
_ -> _ ->
{State3#hybi_8_state{unmasked_msg = UnmaskedMsg}, Recv, {State3#hybi_8_state{unmasked_msg = UnmaskedMsg}, Recv,
Send} Send}