From 22797172a4498a7e8ad0007766bbab874b8ccec7 Mon Sep 17 00:00:00 2001 From: Ery Lee Date: Wed, 14 Jan 2015 13:19:34 +0800 Subject: [PATCH] fix dispatch --- apps/emqtt/src/emqtt_client.erl | 2 +- apps/emqtt/src/emqtt_protocol.erl | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/emqtt/src/emqtt_client.erl b/apps/emqtt/src/emqtt_client.erl index a60c19100..4263242f6 100644 --- a/apps/emqtt/src/emqtt_client.erl +++ b/apps/emqtt/src/emqtt_client.erl @@ -98,7 +98,7 @@ handle_info({stop, duplicate_id, NewPid}, State=#state{conn_name=ConnName}) -> stop({shutdown, duplicate_id}, State); %%TODO: ok?? -handle_info({dispatch, From, Message}, #state{proto_state = ProtoState} = State) -> +handle_info({dispatch, {From, Message}}, #state{proto_state = ProtoState} = State) -> {ok, ProtoState1} = emqtt_protocol:send_message({From, Message}, ProtoState), {noreply, State#state{proto_state = ProtoState1}}; diff --git a/apps/emqtt/src/emqtt_protocol.erl b/apps/emqtt/src/emqtt_protocol.erl index b43e240ae..889ca5ee6 100644 --- a/apps/emqtt/src/emqtt_protocol.erl +++ b/apps/emqtt/src/emqtt_protocol.erl @@ -222,8 +222,9 @@ puback_qos(?PUBREC) -> ?QOS_0; puback_qos(?PUBREL) -> ?QOS_1; puback_qos(?PUBCOMP) -> ?QOS_0. --spec send_message(Message, State) -> {ok, NewState} when - Message :: {pid(), mqtt_message()}, +-spec send_message({From, Message}, State) -> {ok, NewState} when + From :: pid(), + Message :: mqtt_message(), State :: proto_state(), NewState :: proto_state().