From d50507475a68d1e9f35d01836f6b6d8cecf78875 Mon Sep 17 00:00:00 2001 From: Ery Lee Date: Wed, 15 Apr 2015 17:25:34 +0800 Subject: [PATCH] emqtt/include/emqtt.hrl --- apps/emqttd/include/emqttd.hrl | 22 +++------------------- apps/emqttd/src/emqttd_bridge.erl | 2 +- apps/emqttd/src/emqttd_broker.erl | 2 +- apps/emqttd/src/emqttd_client.erl | 4 +++- apps/emqttd/src/emqttd_event.erl | 2 +- apps/emqttd/src/emqttd_http.erl | 2 +- apps/emqttd/src/emqttd_message.erl | 1 + apps/emqttd/src/emqttd_metrics.erl | 2 +- apps/emqttd/src/emqttd_protocol.erl | 5 +++-- apps/emqttd/src/emqttd_pubsub.erl | 11 +++++++---- apps/emqttd/src/emqttd_queue.erl | 4 ++-- apps/emqttd/src/emqttd_retained.erl | 2 +- apps/emqttd/src/emqttd_router.erl | 3 ++- apps/emqttd/src/emqttd_session.erl | 4 ++-- 14 files changed, 29 insertions(+), 37 deletions(-) diff --git a/apps/emqttd/include/emqttd.hrl b/apps/emqttd/include/emqttd.hrl index 2d488bbdd..023db8156 100644 --- a/apps/emqttd/include/emqttd.hrl +++ b/apps/emqttd/include/emqttd.hrl @@ -20,7 +20,7 @@ %% SOFTWARE. %%------------------------------------------------------------------------------ %%% @doc -%%% emqttd header. +%%% MQTT Broker Header. %%% %%% @end %%%----------------------------------------------------------------------------- @@ -86,24 +86,6 @@ -type mqtt_session() :: #mqtt_session{}. -%%------------------------------------------------------------------------------ -%% MQTT Message -%%------------------------------------------------------------------------------ - --type mqtt_msgid() :: undefined | 1..16#ffff. - --record(mqtt_message, { - %% topic is first for message may be retained - topic :: binary(), - qos = 0 :: 0 | 1 | 2, - retain = false :: boolean(), - dup = false :: boolean(), - msgid :: mqtt_msgid(), - payload :: binary() -}). - --type mqtt_message() :: #mqtt_message{}. - %%------------------------------------------------------------------------------ %% MQTT Plugin %%------------------------------------------------------------------------------ @@ -114,4 +96,6 @@ description }). +-type mqtt_plugin() :: #mqtt_plugin{}. + diff --git a/apps/emqttd/src/emqttd_bridge.erl b/apps/emqttd/src/emqttd_bridge.erl index 21cfea37b..24a80d6a8 100644 --- a/apps/emqttd/src/emqttd_bridge.erl +++ b/apps/emqttd/src/emqttd_bridge.erl @@ -30,7 +30,7 @@ -behaviour(gen_server). --include_lib("emqtt/include/emqtt_packet.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include("emqttd.hrl"). diff --git a/apps/emqttd/src/emqttd_broker.erl b/apps/emqttd/src/emqttd_broker.erl index 6c7823e5c..7295035cd 100644 --- a/apps/emqttd/src/emqttd_broker.erl +++ b/apps/emqttd/src/emqttd_broker.erl @@ -26,7 +26,7 @@ %%%----------------------------------------------------------------------------- -module(emqttd_broker). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include("emqttd_systop.hrl"). diff --git a/apps/emqttd/src/emqttd_client.erl b/apps/emqttd/src/emqttd_client.erl index 5b40edd18..7b1c68a63 100644 --- a/apps/emqttd/src/emqttd_client.erl +++ b/apps/emqttd/src/emqttd_client.erl @@ -39,10 +39,12 @@ code_change/3, terminate/2]). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include_lib("emqtt/include/emqtt_packet.hrl"). +-include("emqttd.hrl"). + %%Client State... -record(state, {transport, socket, diff --git a/apps/emqttd/src/emqttd_event.erl b/apps/emqttd/src/emqttd_event.erl index 10a76446c..701de9e63 100644 --- a/apps/emqttd/src/emqttd_event.erl +++ b/apps/emqttd/src/emqttd_event.erl @@ -26,7 +26,7 @@ %%%----------------------------------------------------------------------------- -module(emqttd_event). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). %% API Function Exports -export([start_link/0, diff --git a/apps/emqttd/src/emqttd_http.erl b/apps/emqttd/src/emqttd_http.erl index a3d4c70a2..ad7c42bc6 100644 --- a/apps/emqttd/src/emqttd_http.erl +++ b/apps/emqttd/src/emqttd_http.erl @@ -28,7 +28,7 @@ -author('feng@emqtt.io'). --include_lib("emqtt/include/emqtt_packet.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include("emqttd.hrl"). diff --git a/apps/emqttd/src/emqttd_message.erl b/apps/emqttd/src/emqttd_message.erl index 5f84ef77b..5f198da13 100644 --- a/apps/emqttd/src/emqttd_message.erl +++ b/apps/emqttd/src/emqttd_message.erl @@ -30,6 +30,7 @@ -include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include_lib("emqtt/include/emqtt_packet.hrl"). -export([from_packet/1, to_packet/1]). diff --git a/apps/emqttd/src/emqttd_metrics.erl b/apps/emqttd/src/emqttd_metrics.erl index ffb019374..9c4e1e1bf 100644 --- a/apps/emqttd/src/emqttd_metrics.erl +++ b/apps/emqttd/src/emqttd_metrics.erl @@ -28,7 +28,7 @@ -author('feng@emqtt.io'). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -include("emqttd_systop.hrl"). diff --git a/apps/emqttd/src/emqttd_protocol.erl b/apps/emqttd/src/emqttd_protocol.erl index e76b4eaa5..5ec97378f 100644 --- a/apps/emqttd/src/emqttd_protocol.erl +++ b/apps/emqttd/src/emqttd_protocol.erl @@ -26,10 +26,11 @@ %%%----------------------------------------------------------------------------- -module(emqttd_protocol). --include("emqttd.hrl"). - +-include_lib("emqtt/include/emqtt.hrl"). -include_lib("emqtt/include/emqtt_packet.hrl"). +-include("emqttd.hrl"). + %% API -export([init/2, clientid/1]). diff --git a/apps/emqttd/src/emqttd_pubsub.erl b/apps/emqttd/src/emqttd_pubsub.erl index f2533bb8a..c5a6916c4 100644 --- a/apps/emqttd/src/emqttd_pubsub.erl +++ b/apps/emqttd/src/emqttd_pubsub.erl @@ -28,14 +28,16 @@ -author('feng@emqtt.io'). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). --include_lib("emqtt/include/emqtt_packet.hrl"). +-include("emqttd.hrl"). -behaviour(gen_server). -define(SERVER, ?MODULE). +-define(SUBACK_ERR, 128). + %% Mnesia Callbacks -export([mnesia/1]). @@ -115,13 +117,14 @@ create(Topic) when is_binary(Topic) -> -spec subscribe({Topic, Qos} | list({Topic, Qos})) -> {ok, Qos | list(Qos)} when Topic :: binary(), Qos :: mqtt_qos(). -subscribe(Topics = [{_Topic, _Qos}|_]) -> +subscribe(Topics = [{_Topic, _Qos} | _]) -> {ok, lists:map(fun({Topic, Qos}) -> case subscribe(Topic, Qos) of {ok, GrantedQos} -> GrantedQos; Error -> - lager:error("Failed to subscribe '~s': ~p", [Topic, Error]), ?QOS_ERR + lager:error("Failed to subscribe '~s': ~p", [Topic, Error]), + ?SUBACK_ERR end end, Topics)}. diff --git a/apps/emqttd/src/emqttd_queue.erl b/apps/emqttd/src/emqttd_queue.erl index c2c68363d..f5ce38fce 100644 --- a/apps/emqttd/src/emqttd_queue.erl +++ b/apps/emqttd/src/emqttd_queue.erl @@ -29,7 +29,7 @@ -module(emqttd_queue). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). -export([new/1, new/2, in/3, all/1, clear/1]). @@ -66,7 +66,7 @@ in(ClientId, Message = #mqtt_message{qos = Qos}, Wrapper#mqtt_queue_wrapper{queue = queue:in(Message, Queue)}; false -> % full if - Qos =:= 0 -> + Qos =:= ?QOS_0 -> lager:warning("Queue ~s drop qos0 message: ~p", [ClientId, Message]), Wrapper; true -> diff --git a/apps/emqttd/src/emqttd_retained.erl b/apps/emqttd/src/emqttd_retained.erl index f4797db82..a77cab166 100644 --- a/apps/emqttd/src/emqttd_retained.erl +++ b/apps/emqttd/src/emqttd_retained.erl @@ -30,7 +30,7 @@ -author('feng@slimpp.io'). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). %% Mnesia callbacks -export([mnesia/1]). diff --git a/apps/emqttd/src/emqttd_router.erl b/apps/emqttd/src/emqttd_router.erl index 48a3886b5..0e6d8efb9 100644 --- a/apps/emqttd/src/emqttd_router.erl +++ b/apps/emqttd/src/emqttd_router.erl @@ -23,7 +23,8 @@ %%route chain... statistics -module(emqttd_router). --include("emqttd.hrl"). +-include_lib("emqtt/include/emqtt.hrl"). +%-include("emqttd.hrl"). -behaviour(gen_server). diff --git a/apps/emqttd/src/emqttd_session.erl b/apps/emqttd/src/emqttd_session.erl index 5547faf21..806736f84 100644 --- a/apps/emqttd/src/emqttd_session.erl +++ b/apps/emqttd/src/emqttd_session.erl @@ -26,9 +26,9 @@ %%%----------------------------------------------------------------------------- -module(emqttd_session). --include("emqttd.hrl"). - +-include_lib("emqtt/include/emqtt.hrl"). -include_lib("emqtt/include/emqtt_packet.hrl"). +-include("emqttd.hrl"). %% API Function Exports -export([start/1,