retained

apps/emqtt/src/emqtt_retained.erl

@@ -47,6 +47,7 @@
 -include("emqtt.hrl").
 
 -export([start_link/0,
+        retain/1,
 		lookup/1,
 		insert/2,
 		delete/1,
@@ -66,6 +67,11 @@
 start_link() ->
 	gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
+retain(Msg = #mqtt_message{retain = true}) ->
+	Msg;
+
+retain(Msg) -> Msg.
+
 lookup(Topic) ->
 	ets:lookup(retained_msg, Topic).
 

apps/emqtt/src/emqtt_router.erl

@@ -65,7 +65,10 @@ start_link() ->
     gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
 
 route(Message) ->
-	emqtt_pubsub:publish(retained(reset_dup(Message))).
+    %%TODO: hooks later.
+	emqtt_pubsub:publish(
+        emqtt_message:unset_flag(
+            emqtt_retained:retain(Message))).
 
 %% ------------------------------------------------------------------
 %% gen_server Function Definitions
@@ -92,11 +95,4 @@ code_change(_OldVsn, State, _Extra) ->
 %% ------------------------------------------------------------------
 %% Internal Function Definitions
 %% ------------------------------------------------------------------
-retained(Msg = #mqtt_message{retain = true, topic = Topic}) ->
-	emqtt_retained:insert(Topic, Msg), Msg;
-
-retained(Msg) -> Msg.
-
-reset_dup(Msg = #mqtt_message{dup = true}) -> Msg#mqtt_message{dup = false};
-reset_dup(Msg) -> Msg.
 

apps/emqtt/src/emqtt_session.erl

@@ -235,17 +235,24 @@ handle_cast({resume, ClientId, ClientPid}, State = #session_state {
                                                 awaiting_comp = AwaitingComp,
                                                 expire_timer = ETimer}) ->
     lager:info("Session ~s resumed by ~p", [ClientId, ClientPid]),
+    %cancel timeout timer
     erlang:cancel_timer(ETimer),
 
     %% redelivery PUBREL
-    [ ClientPid ! {redeliver, {?PUBREL, PacketId}} || PacketId <- maps:keys(AwaitingComp) ],
+    lists:foreach(fun(PacketId) ->
+                ClientPid ! {redeliver, {?PUBREL, PacketId}}
+        end, maps:keys(AwaitingComp)),
 
     %% redelivery messages that awaiting PUBACK or PUBREC
     Dup = fun(Msg) -> Msg#mqtt_message{ dup = true } end,
-    [ ClientPid ! {dispatch, {self(), Dup(Message)}} || Message <- maps:values(AwaitingAck) ],
+    lists:foreach(fun(Msg) ->
+                ClientPid ! {dispatch, {self(), Dup(Msg)}}
+        end, maps:values(AwaitingAck)),
 
     %% send offline messages
-    [ClientPid ! {dispatch, {self(), Message}} || Message <- emqtt_queue:all(Queue)],
+    lists:foreach(fun(Msg) ->
+                ClientPid ! {dispatch, {self(), Msg}}
+        end, emqtt_queue:all(Queue)),
 
     NewState = State#session_state{ client_pid = ClientPid, 
                                     msg_queue = emqtt_queue:clear(Queue),