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

Fix issue#575

This commit is contained in:
Feng Lee 2016-06-01 11:52:21 +08:00
parent fea01d8406
commit faa7ae2886
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emqttd_parser.erl
View File

@ -136,14 +136,14 @@ parse_frame(Bin, #mqtt_packet_header{type = Type, qos = Qos} = Header, Length)
<<PacketId:16/big>> = FrameBin, <<PacketId:16/big>> = FrameBin,
wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest); wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest);
{?PUBREL, <<FrameBin:Length/binary, Rest/binary>>} -> {?PUBREL, <<FrameBin:Length/binary, Rest/binary>>} ->
1 = Qos, %% 1 = Qos,
<<PacketId:16/big>> = FrameBin, <<PacketId:16/big>> = FrameBin,
wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest); wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest);
{?PUBCOMP, <<FrameBin:Length/binary, Rest/binary>>} -> {?PUBCOMP, <<FrameBin:Length/binary, Rest/binary>>} ->
<<PacketId:16/big>> = FrameBin, <<PacketId:16/big>> = FrameBin,
wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest); wrap(Header, #mqtt_packet_puback{packet_id = PacketId}, Rest);
{?SUBSCRIBE, <<FrameBin:Length/binary, Rest/binary>>} -> {?SUBSCRIBE, <<FrameBin:Length/binary, Rest/binary>>} ->
1 = Qos, %% 1 = Qos,
<<PacketId:16/big, Rest1/binary>> = FrameBin, <<PacketId:16/big, Rest1/binary>> = FrameBin,
TopicTable = parse_topics(?SUBSCRIBE, Rest1, []), TopicTable = parse_topics(?SUBSCRIBE, Rest1, []),
wrap(Header, #mqtt_packet_subscribe{packet_id = PacketId, wrap(Header, #mqtt_packet_subscribe{packet_id = PacketId,
@ -153,7 +153,7 @@ parse_frame(Bin, #mqtt_packet_header{type = Type, qos = Qos} = Header, Length)
% wrap(Header, #mqtt_packet_suback{packet_id = PacketId, % wrap(Header, #mqtt_packet_suback{packet_id = PacketId,
% qos_table = parse_qos(Rest1, []) }, Rest); % qos_table = parse_qos(Rest1, []) }, Rest);
{?UNSUBSCRIBE, <<FrameBin:Length/binary, Rest/binary>>} -> {?UNSUBSCRIBE, <<FrameBin:Length/binary, Rest/binary>>} ->
1 = Qos, %% 1 = Qos,
<<PacketId:16/big, Rest1/binary>> = FrameBin, <<PacketId:16/big, Rest1/binary>> = FrameBin,
Topics = parse_topics(?UNSUBSCRIBE, Rest1, []), Topics = parse_topics(?UNSUBSCRIBE, Rest1, []),
wrap(Header, #mqtt_packet_unsubscribe{packet_id = PacketId, wrap(Header, #mqtt_packet_unsubscribe{packet_id = PacketId,