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

fix qos_2 subscribe

This commit is contained in:
erylee 2013-01-04 16:29:35 +08:00
parent 97d27e2456
commit ba5e21278e
4 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/emqtt_client.erl
View File

@ -93,35 +93,34 @@ handle_call({go, Sock}, _From, _State) ->
handle_cast(Msg, State) ->
{stop, {badmsg, Msg}, State}.
handle_info({route, Msg}, #state{socket = Sock} = State) ->
handle_info({route, Msg}, #state{socket = Sock, message_id=MsgId} = State) ->
#mqtt_msg{retain = Retain,
qos = Qos,
topic = Topic,
dup = Dup,
message_id = MessageId,
payload = Payload} = Msg,
{DestQos, SendMsgId} =
if
Qos == ?QOS_0 -> {Qos, 0};
Qos == ?QOS_1 -> {?QOS_0, MessageId};
Qos == ?QOS_2 -> {?QOS_1, MessageId}
end,
%?INFO("~p route: ~p", [ConnName, Msg]),
%TODO: FIXME LATER
Frame = #mqtt_frame{fixed = #mqtt_frame_fixed{
type = ?PUBLISH,
qos = DestQos,
Frame = #mqtt_frame{
fixed = #mqtt_frame_fixed{type = ?PUBLISH,
qos = Qos,
retain = Retain,
dup = Dup},
variable = #mqtt_frame_publish{
topic_name = Topic,
message_id = SendMsgId},
variable = #mqtt_frame_publish{topic_name = Topic,
message_id = if
Qos == ?QOS_0 -> undefined;
true -> MsgId
end},
payload = Payload},
send_frame(Sock, Frame),
if
Qos == ?QOS_0 ->
{noreply, State};
true ->
{noreply, next_msg_id(State)}
end;
handle_info({inet_reply, _Ref, ok}, State) ->
{noreply, State, hibernate};
@ -204,12 +203,13 @@ process_received_bytes(Bytes,
end.
process_frame(Frame = #mqtt_frame{fixed = #mqtt_frame_fixed{type = Type}},
State=#state{keep_alive=KeepAlive}) ->
emqtt_keep_alive:activate(KeepAlive),
State=#state{client_id=ClientId, keep_alive=KeepAlive}) ->
KeepAlive1 = emqtt_keep_alive:activate(KeepAlive),
case validate_frame(Type, Frame) of
ok ->
?INFO("frame from ~s: ~p", [ClientId, Frame]),
handle_retained(Type, Frame),
process_request(Type, Frame, State);
process_request(Type, Frame, State#state{keep_alive=KeepAlive1});
{error, Reason} ->
{err, Reason, State}
end.
@ -235,7 +235,7 @@ process_request(?CONNECT,
?ERROR_MSG("MQTT login failed - no credentials"),
{?CONNACK_CREDENTIALS, State};
true ->
?INFO("connect from clientid: ~s", [ClientId]),
?INFO("connect from clientid: ~s, ~p", [ClientId, AlivePeriod]),
ok = emqtt_registry:register(ClientId, self()),
KeepAlive = emqtt_keep_alive:new(AlivePeriod*1500, keep_alive_timeout),
{?CONNACK_ACCEPT,
@ -276,6 +276,19 @@ process_request(?PUBLISH,
{ok, State};
process_request(?PUBACK, #mqtt_frame{}, State) ->
%TODO: fixme later
{ok, State};
process_request(?PUBREC, #mqtt_frame{
variable = #mqtt_frame_publish{message_id = MsgId}},
State=#state{socket=Sock}) ->
%TODO: fixme later
send_frame(Sock,
#mqtt_frame{fixed = #mqtt_frame_fixed{ type = ?PUBREL},
variable = #mqtt_frame_publish{ message_id = MsgId}}),
{ok, State};
process_request(?PUBREL,
#mqtt_frame{
fixed = #mqtt_frame_fixed{ qos = ?QOS_1 },
@ -287,6 +300,11 @@ process_request(?PUBREL,
variable = #mqtt_frame_publish{ message_id = MsgId}}),
{ok, State};
process_request(?PUBCOMP, #mqtt_frame{
variable = #mqtt_frame_publish{message_id = _MsgId}}, State) ->
%TODO: fixme later
{ok, State};
process_request(?SUBSCRIBE,
#mqtt_frame{
variable = #mqtt_frame_subscribe{message_id = MessageId,
@ -362,9 +380,9 @@ send_frame(Sock, Frame) ->
erlang:port_command(Sock, emqtt_frame:serialise(Frame)).
%%----------------------------------------------------------------------------
network_error(_Reason,
network_error(Reason,
State = #state{ conn_name = ConnStr}) ->
?INFO("MQTT detected network error for ~p~n", [ConnStr]),
?INFO("MQTT detected network error '~p' for ~p", [Reason, ConnStr]),
send_will_msg(State),
% todo: flush channel after publish
stop({shutdown, conn_closed}, State).

15
src/emqtt_frame.erl
View File

@ -102,9 +102,18 @@ parse_frame(Bin, #mqtt_frame_fixed{ type = Type,
wrap(Fixed, #mqtt_frame_publish {topic_name = TopicName,
message_id = MessageId },
Payload, Rest);
{?PUBACK, <<FrameBin:Length/binary, Rest/binary>>} ->
<<MessageId:16/big>> = FrameBin,
wrap(Fixed, #mqtt_frame_publish{message_id = MessageId}, Rest);
{?PUBREC, <<FrameBin:Length/binary, Rest/binary>>} ->
<<MessageId:16/big>> = FrameBin,
wrap(Fixed, #mqtt_frame_publish{message_id = MessageId}, Rest);
{?PUBREL, <<FrameBin:Length/binary, Rest/binary>>} ->
<<MessageId:16/big>> = FrameBin,
wrap(Fixed, #mqtt_frame_publish { message_id = MessageId }, Rest);
{?PUBCOMP, <<FrameBin:Length/binary, Rest/binary>>} ->
<<MessageId:16/big>> = FrameBin,
wrap(Fixed, #mqtt_frame_publish { message_id = MessageId }, Rest);
{Subs, <<FrameBin:Length/binary, Rest/binary>>}
when Subs =:= ?SUBSCRIBE orelse Subs =:= ?UNSUBSCRIBE ->
1 = Qos,
@ -199,12 +208,16 @@ serialise_variable(#mqtt_frame_fixed { type = ?PUBACK } = Fixed,
MessageIdBin = <<MessageId:16/big>>,
serialise_fixed(Fixed, MessageIdBin, PayloadBin);
serialise_variable(#mqtt_frame_fixed { type = ?PUBREC } = Fixed,
#mqtt_frame_publish{ message_id = MsgId},
PayloadBin) ->
serialise_fixed(Fixed, <<MsgId:16/big>>, PayloadBin);
serialise_variable(#mqtt_frame_fixed { type = ?PUBREL } = Fixed,
#mqtt_frame_publish{ message_id = MsgId},
PayloadBin) ->
serialise_fixed(Fixed, <<MsgId:16/big>>, PayloadBin);
serialise_variable(#mqtt_frame_fixed { type = ?PUBCOMP } = Fixed,
#mqtt_frame_publish{ message_id = MsgId},
PayloadBin) ->

2
src/emqtt_keep_alive.erl
View File

@ -37,7 +37,7 @@ state(#keep_alive{state=State}) ->
activate(undefined) ->
undefined;
activate(KeepAlive) when is_record(KeepAlive, keep_alive) ->
KeepAlive#keep_alive{state=ative}.
KeepAlive#keep_alive{state=active}.
reset(undefined) ->
undefined;

2
src/emqtt_router.erl
View File

@ -67,7 +67,7 @@ publish(Topic, Msg) when is_list(Topic) and is_record(Msg, mqtt_msg) ->
%route locally, should only be called by publish
route(Topic, Msg) ->
[Client ! {route, Msg} || #subscriber{client=Client} <- ets:lookup(subscriber, Topic)].
[Client ! {route, Msg#mqtt_msg{qos=Qos}} || #subscriber{qos=Qos, client=Client} <- ets:lookup(subscriber, Topic)].
match(Topic) when is_list(Topic) ->
TrieNodes = mnesia:async_dirty(fun trie_match/1, [emqtt_topic:words(Topic)]),