presence and misc fix

apps/emqttd/src/emqttd_client.erl

@@ -100,7 +100,6 @@ handle_info(timeout, State) ->
     
 handle_info({stop, duplicate_id, _NewPid}, State=#state{proto_state = ProtoState,
                                                         conn_name=ConnName}) ->
-    %% TODO: to...
     %% need transfer data???
     %% emqttd_client:transfer(NewPid, Data),
     lager:error("Shutdown for duplicate clientid: ~s, conn:~s", 

apps/emqttd/src/emqttd_mod_presence.erl

@@ -43,24 +43,26 @@ client_connected(ConnAck, #mqtt_client{clientid   = ClientId,
                                        username   = Username,
                                        ipaddress  = IpAddress,
                                        clean_sess = CleanSess,
-                                       proto_ver  = ProtoVer}, _Opts) ->
+                                       proto_ver  = ProtoVer}, Opts) ->
     Sess = case CleanSess of
         true -> false;
         false -> true
     end,
     Json = mochijson2:encode([{username, Username},
-                              {ipaddress, emqttd_net:ntoa(IpAddress)},
+                              {ipaddress, list_to_binary(emqttd_net:ntoa(IpAddress))},
                               {session, Sess},
                               {protocol, ProtoVer},
                               {connack, ConnAck},
                               {ts, emqttd_vm:timestamp()}]),
-    Message = #mqtt_message{topic = topic(connected, ClientId),
+    Message = #mqtt_message{qos     = proplists:get_value(qos, Opts, 0),
+                            topic   = topic(connected, ClientId),
                             payload = iolist_to_binary(Json)},
     emqttd_pubsub:publish(presence, Message).
 
-client_disconnected(Reason, ClientId, _Opts) ->
+client_disconnected(Reason, ClientId, Opts) ->
     Json = mochijson2:encode([{reason, reason(Reason)}, {ts, emqttd_vm:timestamp()}]),
-    emqttd_pubsub:publish(presence, #mqtt_message{topic = topic(disconnected, ClientId),
+    emqttd_pubsub:publish(presence, #mqtt_message{qos     = proplists:get_value(qos, Opts, 0),
+                                                  topic   = topic(disconnected, ClientId),
                                                   payload = iolist_to_binary(Json)}).
 
 unload(_Opts) ->

apps/emqttd/src/emqttd_net.erl

@@ -32,7 +32,7 @@
 
 -export([tcp_name/3, tcp_host/1, getopts/2, setopts/2, getaddr/2, port_to_listeners/1]).
 
--export([peername/1, sockname/1, format/2, format/1, connection_string/2]).
+-export([peername/1, sockname/1, format/2, format/1, connection_string/2, ntoa/1]).
 
 -define(FIRST_TEST_BIND_PORT, 10000).
 

apps/emqttd/src/emqttd_protocol.erl

@@ -121,7 +121,7 @@ received(Packet = ?PACKET(_Type), State) ->
 		{error, Reason, State}
 	end.
 
-handle(Packet = ?CONNECT_PACKET(Var), State0 = #proto_state{peername = Peername = {Addr, _}}) ->
+handle(Packet = ?CONNECT_PACKET(Var), State0 = #proto_state{peername = Peername}) ->
 
     #mqtt_packet_connect{proto_ver  = ProtoVer,
                          proto_name = ProtoName, 
@@ -299,6 +299,9 @@ redeliver({?PUBREL, PacketId}, State) ->
 shutdown(duplicate_id, _State) ->
     quiet; %%
 
+shutdown(_, #proto_state{clientid = undefined}) ->
+    ignore;
+
 shutdown(normal, #proto_state{peername = Peername, clientid = ClientId}) ->
 	lager:info([{client, ClientId}], "Client ~s@~s: normal shutdown",
             [ClientId, emqttd_net:format(Peername)]),

apps/emqttd/src/emqttd_session.erl

@@ -360,7 +360,7 @@ handle_info({dispatch, {_From, Message}}, State) ->
 
 handle_info({'EXIT', ClientPid, Reason}, State = #session_state{clientid = ClientId,
                                                                 client_pid = ClientPid}) ->
-    lager:error("Session: client ~s@~p exited, caused by ~p", [ClientId, ClientPid, Reason]),
+    lager:info("Session: client ~s@~p exited for ~p", [ClientId, ClientPid, Reason]),
     {noreply, start_expire_timer(State#session_state{client_pid = undefined})};
 
 handle_info({'EXIT', ClientPid0, _Reason}, State = #session_state{client_pid = ClientPid}) ->

rel/files/emqttd.config

@@ -124,7 +124,7 @@
     {modules, [
         %% Client presence management module.
         %% Publish messages when client connected or disconnected
-        {presence, []},
+        {presence, [{qos, 0}]},
 
         %% Subscribe topics automatically when client connected
         {autosub, [{"$Q/client/$c", 0}]}

tests/org.eclipse.paho.mqtt.testing

@@ -1 +1 @@
-Subproject commit 17afdf7fb8e148f376d63592bbf3dd4ccdf19e84
+Subproject commit bdc690db847cec1c682e604dca571c72ff756305