yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue #231

This commit is contained in:
Feng 2015-08-11 00:14:07 +08:00
parent f94755166f
commit bb02ced4f2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emqttd_protocol.erl
View File

@ -54,6 +54,7 @@
keepalive, keepalive,
max_clientid_len = ?MAX_CLIENTID_LEN, max_clientid_len = ?MAX_CLIENTID_LEN,
client_pid, client_pid,
ws_cookie, %% for websocket client
connected_at}). connected_at}).
-type proto_state() :: #proto_state{}. -type proto_state() :: #proto_state{}.
@ -65,10 +66,12 @@
init(Peername, SendFun, Opts) -> init(Peername, SendFun, Opts) ->
MaxLen = proplists:get_value(max_clientid_len, Opts, ?MAX_CLIENTID_LEN), MaxLen = proplists:get_value(max_clientid_len, Opts, ?MAX_CLIENTID_LEN),
WsCookie = proplists:get_value(ws_cookie, Opts),
#proto_state{peername = Peername, #proto_state{peername = Peername,
sendfun = SendFun, sendfun = SendFun,
max_clientid_len = MaxLen, max_clientid_len = MaxLen,
client_pid = self()}. client_pid = self(),
ws_cookie = WsCookie}.
info(#proto_state{client_id = ClientId, info(#proto_state{client_id = ClientId,
username = Username, username = Username,
@ -100,6 +103,7 @@ client(#proto_state{client_id = ClientId,
keepalive = Keepalive, keepalive = Keepalive,
will_msg = WillMsg, will_msg = WillMsg,
client_pid = Pid, client_pid = Pid,
ws_cookie = WsCookie,
connected_at = Time}) -> connected_at = Time}) ->
WillTopic = if WillTopic = if
WillMsg =:= undefined -> undefined; WillMsg =:= undefined -> undefined;
@ -113,6 +117,7 @@ client(#proto_state{client_id = ClientId,
proto_ver = ProtoVer, proto_ver = ProtoVer,
keepalive = Keepalive, keepalive = Keepalive,
will_topic = WillTopic, will_topic = WillTopic,
ws_cookie = WsCookie,
connected_at = Time}. connected_at = Time}.
%% CONNECT – Client requests a connection to a Server %% CONNECT – Client requests a connection to a Server

3
src/emqttd_ws_client.erl
View File

@ -104,7 +104,8 @@ init([WsPid, Req, ReplyChannel, PktOpts]) ->
process_flag(trap_exit, true), process_flag(trap_exit, true),
{ok, Peername} = Req:get(peername), {ok, Peername} = Req:get(peername),
SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end, SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end,
ProtoState = emqttd_protocol:init(Peername, SendFun, PktOpts), Cookie = Req:parse_cookie(),
ProtoState = emqttd_protocol:init(Peername, SendFun, [{ws_cookie, Cookie}|PktOpts]),
{ok, #client_state{ws_pid = WsPid, request = Req, proto_state = ProtoState}}. {ok, #client_state{ws_pid = WsPid, request = Req, proto_state = ProtoState}}.
handle_call(_Req, _From, State) -> handle_call(_Req, _From, State) ->