merge emqttc

TODO

@@ -2,42 +2,36 @@
 =====
 merge emqttc code...
 
-
-0.2.2
+0.6.0
 =====
 
-merge pull request#26
+one million connections test...
 
-0.2.0
-=====
+topic match benchmark tests...
 
-1. project structure...
-2. apps, deps, plugins,
-3. rel...
-4. mochiweb: http publish...
-5 cluster...
-6. support MQTT3.1.1...
-7. python, java test code
-8. emqtt_cm to manager clientId, clientPid...
+Dialyzer ...
 
+full test cases...
 
-????
-    {ok, {{simple_one_for_one_terminate, 0, 1},
-          [{client, {emqtt_client, start_link, []}, 
-				temporary, 5000, worker, [emqtt_client]}]}}.
+spawn_link to replace 'spawn' and 'link'
 
-fucking stupid..... esockd locked
+=======
+## ACL
 
-0.2.1
-=====
+## Authentication with clientId
 
-one million connections test...
+## SSL/TLS Socket
 
-topic match benchmark tests...
+## $SYS/topics and Broker statistics...
 
-Dialyzer ...
+## Cluster 
 
-full test cases...
+## Bridge
 
-spawn_link to replace 'spawn' and 'link'
+## Websocket
+
+## MQTT over Websocket
+
+## Mnesia 
 
+Create Schema...

apps/emqtt/src/emqtt_net.erl

@@ -194,7 +194,7 @@ getopts(Sock, Options) when is_port(Sock) ->
 setopts(Sock, Options) when is_port(Sock) ->
     inet:setopts(Sock, Options).
 
-sockname(Sock)   when is_port(Sock) -> inet:sockname(Sock).
+sockname(Sock) when is_port(Sock) -> inet:sockname(Sock).
 
 peer_string(Sock) ->
     case peername(Sock) of

doc/design.md

@@ -22,9 +22,16 @@ Router to register queues
 
 ## Topic Tree
 
-## Cluster 
+## Offline Message
 
-## Bridge
+## ACL
 
-## Offline Message
+## Authentication with clientId
+
+## SSL/TLS Socket
 
+## $SYS/topics and Broker statistics...
+
+## Cluster 
+
+## Bridge