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

msgid -> id

This commit is contained in:
Feng Lee 2016-08-18 10:57:00 +08:00
parent 6beb6bbbe4
commit 354ab5ad21
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/emqttd.hrl
View File

@ -85,7 +85,7 @@
-type(mqtt_pktid() :: 1..16#ffff | undefined). -type(mqtt_pktid() :: 1..16#ffff | undefined).
-record(mqtt_message, { -record(mqtt_message, {
msgid :: mqtt_msgid(), %% Global unique message ID id :: mqtt_msgid(), %% Global unique message ID
pktid :: mqtt_pktid(), %% PacketId pktid :: mqtt_pktid(), %% PacketId
from :: {binary(), undefined | binary()}, %% ClientId and Username from :: {binary(), undefined | binary()}, %% ClientId and Username
topic :: binary(), %% Topic that the message is published to topic :: binary(), %% Topic that the message is published to
@ -96,7 +96,7 @@
sys = false :: boolean(), %% $SYS flag sys = false :: boolean(), %% $SYS flag
headers = [] :: list(), headers = [] :: list(),
payload :: binary(), %% Payload payload :: binary(), %% Payload
timestamp :: erlang:timestamp() %% os:timestamp timestamp :: pos_integer() %% os:timestamp to seconds
}). }).
-type(mqtt_message() :: #mqtt_message{}). -type(mqtt_message() :: #mqtt_message{}).

10
src/emqttd_message.erl
View File

@ -37,7 +37,7 @@ make(From, Topic, Payload) ->
-spec(make(msg_from(), mqtt_qos(), binary(), binary()) -> mqtt_message()). -spec(make(msg_from(), mqtt_qos(), binary(), binary()) -> mqtt_message()).
make(From, Qos, Topic, Payload) -> make(From, Qos, Topic, Payload) ->
#mqtt_message{msgid = msgid(), #mqtt_message{id = msgid(),
from = From, from = From,
qos = ?QOS_I(Qos), qos = ?QOS_I(Qos),
topic = Topic, topic = Topic,
@ -53,7 +53,7 @@ from_packet(#mqtt_packet{header = #mqtt_packet_header{type = ?PUBLISH,
variable = #mqtt_packet_publish{topic_name = Topic, variable = #mqtt_packet_publish{topic_name = Topic,
packet_id = PacketId}, packet_id = PacketId},
payload = Payload}) -> payload = Payload}) ->
#mqtt_message{msgid = msgid(), #mqtt_message{id = msgid(),
pktid = PacketId, pktid = PacketId,
qos = Qos, qos = Qos,
retain = Retain, retain = Retain,
@ -71,7 +71,7 @@ from_packet(#mqtt_packet_connect{client_id = ClientId,
will_qos = Qos, will_qos = Qos,
will_topic = Topic, will_topic = Topic,
will_msg = Msg}) -> will_msg = Msg}) ->
#mqtt_message{msgid = msgid(), #mqtt_message{id = msgid(),
topic = Topic, topic = Topic,
from = {ClientId, Username}, from = {ClientId, Username},
retain = Retain, retain = Retain,
@ -138,13 +138,13 @@ unset_flag(retain, Msg = #mqtt_message{retain = true}) ->
unset_flag(Flag, Msg) when Flag =:= dup orelse Flag =:= retain -> Msg. unset_flag(Flag, Msg) when Flag =:= dup orelse Flag =:= retain -> Msg.
%% @doc Format MQTT Message %% @doc Format MQTT Message
format(#mqtt_message{msgid = MsgId, pktid = PktId, from = {ClientId, Username}, format(#mqtt_message{id = MsgId, pktid = PktId, from = {ClientId, Username},
qos = Qos, retain = Retain, dup = Dup, topic =Topic}) -> qos = Qos, retain = Retain, dup = Dup, topic =Topic}) ->
io_lib:format("Message(Q~p, R~p, D~p, MsgId=~p, PktId=~p, From=~s/~s, Topic=~s)", io_lib:format("Message(Q~p, R~p, D~p, MsgId=~p, PktId=~p, From=~s/~s, Topic=~s)",
[i(Qos), i(Retain), i(Dup), MsgId, PktId, Username, ClientId, Topic]); [i(Qos), i(Retain), i(Dup), MsgId, PktId, Username, ClientId, Topic]);
%% TODO:... %% TODO:...
format(#mqtt_message{msgid = MsgId, pktid = PktId, from = From, format(#mqtt_message{id = MsgId, pktid = PktId, from = From,
qos = Qos, retain = Retain, dup = Dup, topic =Topic}) -> qos = Qos, retain = Retain, dup = Dup, topic =Topic}) ->
io_lib:format("Message(Q~p, R~p, D~p, MsgId=~p, PktId=~p, From=~s, Topic=~s)", io_lib:format("Message(Q~p, R~p, D~p, MsgId=~p, PktId=~p, From=~s, Topic=~s)",
[i(Qos), i(Retain), i(Dup), MsgId, PktId, From, Topic]). [i(Qos), i(Retain), i(Dup), MsgId, PktId, From, Topic]).

4
test/emqttd_protocol_SUITE.erl
View File

@ -337,9 +337,9 @@ packet_format(_) ->
message_make(_) -> message_make(_) ->
Msg = emqttd_message:make(<<"clientid">>, <<"topic">>, <<"payload">>), Msg = emqttd_message:make(<<"clientid">>, <<"topic">>, <<"payload">>),
0 = Msg#mqtt_message.qos, 0 = Msg#mqtt_message.qos,
undefined = Msg#mqtt_message.msgid, undefined = Msg#mqtt_message.id,
Msg1 = emqttd_message:make(<<"clientid">>, qos2, <<"topic">>, <<"payload">>), Msg1 = emqttd_message:make(<<"clientid">>, qos2, <<"topic">>, <<"payload">>),
true = is_binary(Msg1#mqtt_message.msgid), true = is_binary(Msg1#mqtt_message.id),
2 = Msg1#mqtt_message.qos. 2 = Msg1#mqtt_message.qos.
message_from_packet(_) -> message_from_packet(_) ->