From a7f4563050357ccfd43f7b7dc7a9398ff4934e54 Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Mon, 2 Mar 2015 21:25:58 +0800 Subject: [PATCH] misc fix --- Makefile | 15 ++++++++++++--- TODO | 18 ++++++++++++++++++ apps/emqtt/src/emqtt_net.erl | 2 +- doc/design.md | 13 ++++++++++--- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 6adbf3bf0..f70e77bab 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,22 @@ + +REBAR=./rebar + all: get-deps compile compile: get-deps - ./rebar compile + @$(REBAR) compile get-deps: - ./rebar get-deps + @$(REBAR) get-deps + +update-deps: + @$(REBAR) update-deps + +xref: + @$(REBAR) xref skip_deps=true clean: - ./rebar clean + @$(REBAR) clean rm -rf rel/emqtt dist: diff --git a/TODO b/TODO index a54ea4635..fa535fa3e 100644 --- a/TODO +++ b/TODO @@ -37,4 +37,22 @@ full test cases... spawn_link to replace 'spawn' and 'link' +## ACL +## Authentication with clientId + +## SSL/TLS Socket + +## $SYS/topics and Broker statistics... + +## Cluster + +## Bridge + +## Websocket + +## MQTT over Websocket + +## Mnesia + +Create Schema... diff --git a/apps/emqtt/src/emqtt_net.erl b/apps/emqtt/src/emqtt_net.erl index 21d98d704..735e5c550 100644 --- a/apps/emqtt/src/emqtt_net.erl +++ b/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 diff --git a/doc/design.md b/doc/design.md index 9e775a095..b23963c51 100644 --- a/doc/design.md +++ b/doc/design.md @@ -22,9 +22,16 @@ Router to register queues ## Topic Tree +## Offline Message + +## ACL + +## Authentication with clientId + +## SSL/TLS Socket + +## $SYS/topics and Broker statistics... + ## Cluster ## Bridge - -## Offline Message -