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

more test cases for parer

This commit is contained in:
Feng 2016-04-12 11:19:55 +08:00
parent ffb30167ea
commit b257423730
2 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_parser.erl
View File

@ -61,8 +61,10 @@ parse_remaining_len(_Bin, _Header, _Multiplier, Length, #mqtt_packet_limit{max_p
{error, invalid_mqtt_frame_len}; {error, invalid_mqtt_frame_len};
parse_remaining_len(<<>>, Header, Multiplier, Length, Limit) -> parse_remaining_len(<<>>, Header, Multiplier, Length, Limit) ->
{more, fun(Bin) -> parse_remaining_len(Bin, Header, Multiplier, Length, Limit) end}; {more, fun(Bin) -> parse_remaining_len(Bin, Header, Multiplier, Length, Limit) end};
%% optimize: match PUBACK, PUBREC, PUBREL, PUBCOMP, UNSUBACK...
parse_remaining_len(<<0:1, 2:7, Rest/binary>>, Header, 1, 0, _Limit) -> parse_remaining_len(<<0:1, 2:7, Rest/binary>>, Header, 1, 0, _Limit) ->
parse_frame(Rest, Header, 2); parse_frame(Rest, Header, 2);
%% optimize: match PINGREQ...
parse_remaining_len(<<0:8, Rest/binary>>, Header, 1, 0, _Limit) -> parse_remaining_len(<<0:8, Rest/binary>>, Header, 1, 0, _Limit) ->
parse_frame(Rest, Header, 0); parse_frame(Rest, Header, 0);
parse_remaining_len(<<1:1, Len:7, Rest/binary>>, Header, Multiplier, Value, Limit) -> parse_remaining_len(<<1:1, Len:7, Rest/binary>>, Header, Multiplier, Value, Limit) ->

56
test/emqttd_protocol_SUITE.erl
View File

@ -36,7 +36,11 @@ groups() ->
parse_bridge, parse_bridge,
parse_publish, parse_publish,
parse_puback, parse_puback,
parse_pubrec,
parse_pubrel,
parse_pubcomp,
parse_subscribe, parse_subscribe,
parse_unsubscribe,
parse_pingreq, parse_pingreq,
parse_disconnect]}, parse_disconnect]},
{serializer, [], {serializer, [],
@ -173,17 +177,61 @@ parse_publish(_) ->
parse_puback(_) -> parse_puback(_) ->
Parser = emqttd_parser:new([]), Parser = emqttd_parser:new([]),
%%PUBACK(Qos=0, Retain=false, Dup=false, PacketId=1) %%PUBACK(Qos=0, Retain=false, Dup=false, PacketId=1)
PubAckBin = <<64,2,0,1>>,
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBACK, {ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBACK,
dup = false, dup = false,
qos = 0, qos = 0,
retain = false}}, <<>>} = Parser(PubAckBin). retain = false}}, <<>>} = Parser(<<64,2,0,1>>).
parse_pubrec(_) ->
Parser = emqttd_parser:new([]),
%%PUBREC(Qos=0, Retain=false, Dup=false, PacketId=1)
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBREC,
dup = false,
qos = 0,
retain = false}}, <<>>} = Parser(<<5:4,0:4,2,0,1>>).
parse_pubrel(_) ->
Parser = emqttd_parser:new([]),
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBREL,
dup = false,
qos = 1,
retain = false}}, <<>>} = Parser(<<6:4,2:4,2,0,1>>).
parse_pubcomp(_) ->
Parser = emqttd_parser:new([]),
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PUBCOMP,
dup = false,
qos = 0,
retain = false}}, <<>>} = Parser(<<7:4,0:4,2,0,1>>).
parse_subscribe(_) -> parse_subscribe(_) ->
ok. Parser = emqttd_parser:new([]),
%% SUBSCRIBE(Q1, R0, D0, PacketId=2, TopicTable=[{<<"TopicA">>,2}])
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?SUBSCRIBE,
dup = false,
qos = 1,
retain = false},
variable = #mqtt_packet_subscribe{packet_id = 2,
topic_table = [{<<"TopicA">>,2}]} }, <<>>}
= Parser(<<130,11,0,2,0,6,84,111,112,105,99,65,2>>).
parse_unsubscribe(_) ->
Parser = emqttd_parser:new([]),
%% UNSUBSCRIBE(Q1, R0, D0, PacketId=2, TopicTable=[<<"TopicA">>])
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?UNSUBSCRIBE,
dup = false,
qos = 1,
retain = false},
variable = #mqtt_packet_unsubscribe{packet_id = 2,
topics = [<<"TopicA">>]}}, <<>>}
= Parser(<<162,10,0,2,0,6,84,111,112,105,99,65>>).
parse_pingreq(_) -> parse_pingreq(_) ->
ok. Parser = emqttd_parser:new([]),
{ok, #mqtt_packet{header = #mqtt_packet_header{type = ?PINGREQ,
dup = false,
qos = 0,
retain = false}}, <<>>}
= Parser(<<?PINGREQ:4, 0:4, 0:8>>).
parse_disconnect(_) -> parse_disconnect(_) ->
Parser = emqttd_parser:new([]), Parser = emqttd_parser:new([]),