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

merge mqtt-sn

This commit is contained in:
Feng Lee 2016-08-22 17:41:54 +08:00
parent a318244be0 61a64ea0b0
commit a0e2d2981a
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/emqttd_client.erl
View File

@ -87,7 +87,13 @@ init([OriginConn, MqttEnv]) ->
end, end,
ConnName = esockd_net:format(PeerName), ConnName = esockd_net:format(PeerName),
Self = self(), Self = self(),
SendFun = fun(Data) ->
%%TODO: Send packet...
SendFun = fun(Packet) ->
Data = emqttd_serializer:serialize(Packet),
%%TODO: How to Log???
?LOG(debug, "SEND ~p", [Data], #client_state{connname = ConnName}),
emqttd_metrics:inc('bytes/sent', size(Data)),
try Connection:async_send(Data) of try Connection:async_send(Data) of
true -> ok true -> ok
catch catch

9
src/emqttd_protocol.erl
View File

@ -236,8 +236,8 @@ publish(Packet = ?PUBLISH_PACKET(?QOS_2, _PacketId), State) ->
with_puback(Type, Packet = ?PUBLISH_PACKET(_Qos, PacketId), with_puback(Type, Packet = ?PUBLISH_PACKET(_Qos, PacketId),
State = #proto_state{client_id = ClientId, State = #proto_state{client_id = ClientId,
username = Username, username = Username,
session = Session}) -> session = Session}) ->
Msg = emqttd_message:from_packet(Username, ClientId, Packet), Msg = emqttd_message:from_packet(Username, ClientId, Packet),
case emqttd_session:publish(Session, Msg) of case emqttd_session:publish(Session, Msg) of
ok -> ok ->
@ -256,10 +256,7 @@ send(Packet, State = #proto_state{sendfun = SendFun})
when is_record(Packet, mqtt_packet) -> when is_record(Packet, mqtt_packet) ->
trace(send, Packet, State), trace(send, Packet, State),
emqttd_metrics:sent(Packet), emqttd_metrics:sent(Packet),
Data = emqttd_serializer:serialize(Packet), SendFun(Packet),
?LOG(debug, "SEND ~p", [Data], State),
emqttd_metrics:inc('bytes/sent', size(Data)),
SendFun(Data),
{ok, State}. {ok, State}.
trace(recv, Packet, ProtoState) -> trace(recv, Packet, ProtoState) ->

7
src/emqttd_ws_client.erl
View File

@ -66,7 +66,12 @@ init([MqttEnv, WsPid, Req, ReplyChannel]) ->
{ok, Peername} = Req:get(peername), {ok, Peername} = Req:get(peername),
Headers = mochiweb_headers:to_list( Headers = mochiweb_headers:to_list(
mochiweb_request:get(headers, Req)), mochiweb_request:get(headers, Req)),
SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end, %% SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end,
SendFun = fun(Packet) ->
Data = emqttd_serializer:serialize(Packet),
emqttd_metrics:inc('bytes/sent', size(Data)),
ReplyChannel({binary, Data})
end,
ProtoState = emqttd_protocol:init(Peername, SendFun, ProtoState = emqttd_protocol:init(Peername, SendFun,
[{ws_initial_headers, Headers} | MqttEnv]), [{ws_initial_headers, Headers} | MqttEnv]),
{ok, #wsclient_state{ws_pid = WsPid, peer = Req:get(peer), {ok, #wsclient_state{ws_pid = WsPid, peer = Req:get(peer),