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

fix issue #438

This commit is contained in:
Feng 2016-02-21 10:06:14 +08:00
parent 5695ba178c
commit e40775f1f1
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

@ -74,7 +74,8 @@ parse_frame(Bin, #mqtt_packet_header{type = Type, qos = Qos} = Header, Length)
case {Type, Bin} of case {Type, Bin} of
{?CONNECT, <<FrameBin:Length/binary, Rest/binary>>} -> {?CONNECT, <<FrameBin:Length/binary, Rest/binary>>} ->
{ProtoName, Rest1} = parse_utf(FrameBin), {ProtoName, Rest1} = parse_utf(FrameBin),
<<ProtoVersion : 8, Rest2/binary>> = Rest1, %% Fix mosquitto bridge: 0x83, 0x84
<<_Bridge:4, ProtoVersion:4, Rest2/binary>> = Rest1,
<<UsernameFlag : 1, <<UsernameFlag : 1,
PasswordFlag : 1, PasswordFlag : 1,
WillRetain : 1, WillRetain : 1,
@ -208,7 +209,6 @@ parse_msg(<<Len:16/big, Msg:Len/binary, Rest/binary>>, _) ->
bool(0) -> false; bool(0) -> false;
bool(1) -> true. bool(1) -> true.
%% Fix mosquitto bridge: 0x83, 0x84
protocol_name_approved(Ver, Name) -> protocol_name_approved(Ver, Name) ->
lists:member({Ver band 16#0F, Name}, ?PROTOCOL_NAMES). lists:member({Ver, Name}, ?PROTOCOL_NAMES).