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

Merge pull request #584 from emqtt/emq10 

Fix issue#575 - Compatible with the Qos0 PUBREL packet
This commit is contained in:
Feng Lee 2016-06-04 19:08:57 +08:00
parent 5eb23a2b90 a248b471b9
commit 3166ebba92
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqttd_parser.erl
View File

@ -44,10 +44,10 @@ limit(Opts) ->
-> {ok, mqtt_packet()} | {error, any()} | {more, fun()}). -> {ok, mqtt_packet()} | {error, any()} | {more, fun()}).
parse(<<>>, {none, Limit}) -> parse(<<>>, {none, Limit}) ->
{more, fun(Bin) -> parse(Bin, {none, Limit}) end}; {more, fun(Bin) -> parse(Bin, {none, Limit}) end};
parse(<<PacketType:4, Dup:1, QoS:2, Retain:1, Rest/binary>>, {none, Limit}) -> parse(<<Type:4, Dup:1, QoS:2, Retain:1, Rest/binary>>, {none, Limit}) ->
parse_remaining_len(Rest, #mqtt_packet_header{type = PacketType, parse_remaining_len(Rest, #mqtt_packet_header{type = Type,
dup = bool(Dup), dup = bool(Dup),
qos = QoS, qos = fixqos(Type, QoS),
retain = bool(Retain)}, Limit); retain = bool(Retain)}, Limit);
parse(Bin, Cont) -> Cont(Bin). parse(Bin, Cont) -> Cont(Bin).
@ -218,3 +218,9 @@ bool(1) -> true.
protocol_name_approved(Ver, Name) -> protocol_name_approved(Ver, Name) ->
lists:member({Ver, Name}, ?PROTOCOL_NAMES). lists:member({Ver, Name}, ?PROTOCOL_NAMES).
%% Fix Issue#575
fixqos(?PUBREL, 0) -> 1;
fixqos(?SUBSCRIBE, 0) -> 1;
fixqos(?UNSUBSCRIBE, 0) -> 1;
fixqos(_Type, QoS) -> QoS.