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

format

This commit is contained in:
Ery Lee 2015-03-08 18:15:30 +08:00
parent b3178ffcd5
commit 00f39607f1
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/emqtt/src/emqtt_parser.erl
View File

@ -33,7 +33,6 @@
%% API
-export([init/0, parse/2]).
%%%-----------------------------------------------------------------------------
%% @doc
%% Initialize a parser.
@ -178,9 +177,9 @@ parse_frame(Bin, #mqtt_packet_header{type = Type,
wrap(Header, Variable, Payload, Rest) ->
{ok, #mqtt_packet{header = Header, variable = Variable, payload = Payload}, Rest}.
wrap(Header, Variable, Rest) ->
{ok, #mqtt_packet {header = Header, variable = Variable}, Rest}.
{ok, #mqtt_packet{header = Header, variable = Variable}, Rest}.
wrap(Header, Rest) ->
{ok, #mqtt_packet {header = Header}, Rest}.
{ok, #mqtt_packet{header = Header}, Rest}.
%client function
%parse_qos(<<>>, Acc) ->

36
apps/emqtt/src/emqtt_serialiser.erl
View File

@ -33,6 +33,13 @@
%% API
-export([serialise/1]).
%%------------------------------------------------------------------------------
%% @doc
%% Serialise MQTT Packet.
%%
%% @end
%%------------------------------------------------------------------------------
-spec serialise(mqtt_packet()) -> binary().
serialise(#mqtt_packet{header = Header = #mqtt_packet_header{type = Type},
variable = Variable,
payload = Payload}) ->
@ -44,13 +51,14 @@ serialise_header(#mqtt_packet_header{type = Type,
dup = Dup,
qos = Qos,
retain = Retain},
{VariableBin, PayloadBin})
when is_integer(Type) andalso ?CONNECT =< Type andalso Type =< ?DISCONNECT ->
{VariableBin, PayloadBin}) when ?CONNECT =< Type andalso Type =< ?DISCONNECT ->
Len = size(VariableBin) + size(PayloadBin),
true = (Len =< ?MAX_LEN),
LenBin = serialise_len(Len),
<<Type:4, (opt(Dup)):1, (opt(Qos)):2, (opt(Retain)):1,
LenBin/binary, VariableBin/binary, PayloadBin/binary>>.
LenBin/binary,
VariableBin/binary,
PayloadBin/binary>>.
serialise_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId,
proto_ver = ProtoVer,
@ -63,7 +71,7 @@ serialise_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId,
will_topic = WillTopic,
will_msg = WillMsg,
username = Username,
password = Password }, undefined) ->
password = Password}, undefined) ->
VariableBin = <<(size(ProtoName)):16/big-unsigned-integer,
ProtoName/binary,
ProtoVer:8,
@ -87,28 +95,25 @@ serialise_variable(?CONNECT, #mqtt_packet_connect{client_id = ClientId,
{VariableBin, <<PayloadBin1/binary, UserPasswd/binary>>};
serialise_variable(?CONNACK, #mqtt_packet_connack{ack_flags = AckFlags,
return_code = ReturnCode},
undefined) ->
return_code = ReturnCode}, undefined) ->
{<<AckFlags:8, ReturnCode:8>>, <<>>};
serialise_variable(?SUBSCRIBE, #mqtt_packet_subscribe{packet_id = PacketId,
topic_table = Topics }, undefined) ->
{<<PacketId:16/big>>, serialise_topics(Topics)};
serialise_variable(?SUBACK, #mqtt_packet_suback {packet_id = PacketId,
qos_table = QosTable},
undefined) ->
serialise_variable(?SUBACK, #mqtt_packet_suback{packet_id = PacketId,
qos_table = QosTable}, undefined) ->
{<<PacketId:16/big>>, << <<Q:8>> || Q <- QosTable >>};
serialise_variable(?UNSUBSCRIBE, #mqtt_packet_unsubscribe{
packet_id = PacketId, topics = Topics }, undefined) ->
serialise_variable(?UNSUBSCRIBE, #mqtt_packet_unsubscribe{packet_id = PacketId,
topics = Topics }, undefined) ->
{<<PacketId:16/big>>, serialise_topics(Topics)};
serialise_variable(?UNSUBACK, #mqtt_packet_unsuback{packet_id = PacketId},
undefined) ->
serialise_variable(?UNSUBACK, #mqtt_packet_unsuback{packet_id = PacketId}, undefined) ->
{<<PacketId:16/big>>, <<>>};
serialise_variable(?PUBLISH, #mqtt_packet_publish { topic_name = TopicName,
serialise_variable(?PUBLISH, #mqtt_packet_publish{topic_name = TopicName,
packet_id = PacketId }, PayloadBin) ->
TopicBin = serialise_utf(TopicName),
PacketIdBin = if
@ -117,7 +122,7 @@ serialise_variable(?PUBLISH, #mqtt_packet_publish { topic_name = TopicName,
end,
{<<TopicBin/binary, PacketIdBin/binary>>, PayloadBin};
serialise_variable(PubAck, #mqtt_packet_puback { packet_id = PacketId }, _Payload)
serialise_variable(PubAck, #mqtt_packet_puback{packet_id = PacketId}, _Payload)
when PubAck =:= ?PUBACK; PubAck =:= ?PUBREC; PubAck =:= ?PUBREL; PubAck =:= ?PUBCOMP ->
{<<PacketId:16/big>>, <<>>};
@ -157,3 +162,4 @@ opt(false) -> 0;
opt(true) -> 1;
opt(X) when is_integer(X) -> X;
opt(B) when is_binary(B) -> 1.