From 7e00805af3767bf38d2088239b83b58ccddb0a99 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 3 Aug 2021 14:30:31 +0800 Subject: [PATCH] chore(gw-lwm2m): remove needless files --- .../emqx_gateway/src/lwm2m/emqx_lwm2m.app.src | 7 -- .../emqx_gateway/src/lwm2m/emqx_lwm2m_app.erl | 43 ------- .../src/lwm2m/emqx_lwm2m_cm_sup.erl | 41 ------ .../src/lwm2m/emqx_lwm2m_coap_server.erl | 117 ------------------ .../src/lwm2m/emqx_lwm2m_protocol.erl | 2 +- .../emqx_gateway/src/lwm2m/emqx_lwm2m_sup.erl | 39 ------ 6 files changed, 1 insertion(+), 248 deletions(-) delete mode 100644 apps/emqx_gateway/src/lwm2m/emqx_lwm2m.app.src delete mode 100644 apps/emqx_gateway/src/lwm2m/emqx_lwm2m_app.erl delete mode 100644 apps/emqx_gateway/src/lwm2m/emqx_lwm2m_cm_sup.erl delete mode 100644 apps/emqx_gateway/src/lwm2m/emqx_lwm2m_coap_server.erl delete mode 100644 apps/emqx_gateway/src/lwm2m/emqx_lwm2m_sup.erl diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m.app.src b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m.app.src deleted file mode 100644 index 209499fc5..000000000 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m.app.src +++ /dev/null @@ -1,7 +0,0 @@ -{application,emqx_lwm2m, - [{description,"EMQ X LwM2M Gateway"}, - {vsn, "4.3.2"}, % strict semver, bump manually! - {modules,[]}, - {registered,[emqx_lwm2m_sup]}, - {applications,[kernel,stdlib,lwm2m_coap]}, - {mod,{emqx_lwm2m_app,[]}}]}. diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_app.erl b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_app.erl deleted file mode 100644 index 46f29c208..000000000 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_app.erl +++ /dev/null @@ -1,43 +0,0 @@ -%%-------------------------------------------------------------------- -%% Copyright (c) 2020-2021 EMQ Technologies Co., Ltd. All Rights Reserved. -%% -%% Licensed under the Apache License, Version 2.0 (the "License"); -%% you may not use this file except in compliance with the License. -%% You may obtain a copy of the License at -%% -%% http://www.apache.org/licenses/LICENSE-2.0 -%% -%% Unless required by applicable law or agreed to in writing, software -%% distributed under the License is distributed on an "AS IS" BASIS, -%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -%% See the License for the specific language governing permissions and -%% limitations under the License. -%%-------------------------------------------------------------------- - --module(emqx_lwm2m_app). - --behaviour(application). - --emqx_plugin(protocol). - --export([ start/2 - , stop/1 - , prep_stop/1 - ]). - --include("src/lwm2m/include/emqx_lwm2m.hrl"). - -start(_Type, _Args) -> - Pid = emqx_lwm2m_sup:start_link(), - _ = lwm2m_coap_server:start_registry(), - lwm2m_coap_server_registry:add_handler([<<"rd">>], emqx_lwm2m_coap_resource, undefined), - emqx_lwm2m_coap_server:start(application:get_all_env(?APP)), - Pid. - -prep_stop(State) -> - lwm2m_coap_server_registry:remove_handler([<<"rd">>], emqx_lwm2m_coap_resource, undefined), - emqx_lwm2m_coap_server:stop(application:get_all_env(?APP)), - State. - -stop(_State) -> - ok. diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_cm_sup.erl b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_cm_sup.erl deleted file mode 100644 index b55f4f33c..000000000 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_cm_sup.erl +++ /dev/null @@ -1,41 +0,0 @@ - -%%-------------------------------------------------------------------- -%% Copyright (c) 2020 EMQ Technologies Co., Ltd. All Rights Reserved. -%% -%% Licensed under the Apache License, Version 2.0 (the "License"); -%% you may not use this file except in compliance with the License. -%% You may obtain a copy of the License at -%% -%% http://www.apache.org/licenses/LICENSE-2.0 -%% -%% Unless required by applicable law or agreed to in writing, software -%% distributed under the License is distributed on an "AS IS" BASIS, -%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -%% See the License for the specific language governing permissions and -%% limitations under the License. -%%-------------------------------------------------------------------- - --module(emqx_lwm2m_cm_sup). - --behaviour(supervisor). - --export([start_link/0]). - --export([init/1]). - -start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). - -init([]) -> - CM = #{id => emqx_lwm2m_cm, - start => {emqx_lwm2m_cm, start_link, []}, - restart => permanent, - shutdown => 5000, - type => worker, - modules => [emqx_lwm2m_cm]}, - SupFlags = #{strategy => one_for_one, - intensity => 100, - period => 10 - }, - {ok, {SupFlags, [CM]}}. - diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_coap_server.erl b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_coap_server.erl deleted file mode 100644 index b2f793364..000000000 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_coap_server.erl +++ /dev/null @@ -1,117 +0,0 @@ -%%-------------------------------------------------------------------- -%% Copyright (c) 2020-2021 EMQ Technologies Co., Ltd. All Rights Reserved. -%% -%% Licensed under the Apache License, Version 2.0 (the "License"); -%% you may not use this file except in compliance with the License. -%% You may obtain a copy of the License at -%% -%% http://www.apache.org/licenses/LICENSE-2.0 -%% -%% Unless required by applicable law or agreed to in writing, software -%% distributed under the License is distributed on an "AS IS" BASIS, -%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -%% See the License for the specific language governing permissions and -%% limitations under the License. -%%-------------------------------------------------------------------- - --module(emqx_lwm2m_coap_server). - --include("src/lwm2m/include/emqx_lwm2m.hrl"). - --export([ start/1 - , stop/1 - ]). - --export([ start_listener/1 - , start_listener/3 - , stop_listener/1 - , stop_listener/2 - ]). - --include_lib("emqx/include/logger.hrl"). - -start(Envs) -> - start_listeners(Envs). - -stop(Envs) -> - stop_listeners(Envs). - -%%-------------------------------------------------------------------- -%% Internal funcs -%%-------------------------------------------------------------------- - -start_listeners(Envs) -> - lists:foreach(fun start_listener/1, listeners_confs(Envs)). - -stop_listeners(Envs) -> - lists:foreach(fun stop_listener/1, listeners_confs(Envs)). - -start_listener({Proto, ListenOn, Opts}) -> - case start_listener(Proto, ListenOn, Opts) of - {ok, _Pid} -> - ?ULOG("Start lwm2m:~s listener on ~s successfully.~n", - [Proto, format(ListenOn)]); - {error, Reason} -> - ?ELOG("Failed to start lwm2m:~s listener on ~s: ~0p~n", - [Proto, format(ListenOn), Reason]), - error(Reason) - end. - -start_listener(udp, ListenOn, Opts) -> - lwm2m_coap_server:start_udp('lwm2m:udp', ListenOn, Opts); -start_listener(dtls, ListenOn, Opts) -> - lwm2m_coap_server:start_dtls('lwm2m:dtls', ListenOn, Opts). - -stop_listener({Proto, ListenOn, _Opts}) -> - Ret = stop_listener(Proto, ListenOn), - case Ret of - ok -> ?ULOG("Stop lwm2m:~s listener on ~s successfully.~n", - [Proto, format(ListenOn)]); - {error, Reason} -> - ?ELOG("Failed to stop lwm2m:~s listener on ~s: ~0p~n", - [Proto, format(ListenOn), Reason]) - end, - Ret. - -stop_listener(udp, ListenOn) -> - lwm2m_coap_server:stop_udp('lwm2m:udp', ListenOn); -stop_listener(dtls, ListenOn) -> - lwm2m_coap_server:stop_dtls('lwm2m:dtls', ListenOn). - -listeners_confs(Envs) -> - listeners_confs(udp, Envs) ++ listeners_confs(dtls, Envs). - -listeners_confs(udp, Envs) -> - Udps = proplists:get_value(bind_udp, Envs, []), - Opts = proplists:get_value(options, Envs, []), - [{udp, Port, [{udp_options, InetOpts ++ Opts}] ++ get_lwm2m_opts(Envs)} || {Port, InetOpts} <- Udps]; - -listeners_confs(dtls, Envs) -> - Dtls = proplists:get_value(bind_dtls, Envs, []), - Opts = proplists:get_value(dtls_opts, Envs, []), - [{dtls, Port, [{dtls_options, InetOpts ++ Opts}] ++ get_lwm2m_opts(Envs)} || {Port, InetOpts} <- Dtls]. - -format(Port) when is_integer(Port) -> - io_lib:format("0.0.0.0:~w", [Port]); -format({Addr, Port}) when is_list(Addr) -> - io_lib:format("~s:~w", [Addr, Port]); -format({Addr, Port}) when is_tuple(Addr) -> - io_lib:format("~s:~w", [inet:ntoa(Addr), Port]). - -get_lwm2m_opts(Envs) -> - LifetimeMax = proplists:get_value(lifetime_max, Envs, 315360000), - LifetimeMin = proplists:get_value(lifetime_min, Envs, 0), - Mountpoint = proplists:get_value(mountpoint, Envs, ""), - Sockport = proplists:get_value(port, Envs, 5683), - AutoObserve = proplists:get_value(auto_observe, Envs, []), - QmodeTimeWindow = proplists:get_value(qmode_time_window, Envs, []), - Topics = proplists:get_value(topics, Envs, []), - PublishCondition = proplists:get_value(update_msg_publish_condition, Envs, contains_object_list), - [{lifetime_max, LifetimeMax}, - {lifetime_min, LifetimeMin}, - {mountpoint, list_to_binary(Mountpoint)}, - {port, Sockport}, - {auto_observe, AutoObserve}, - {qmode_time_window, QmodeTimeWindow}, - {update_msg_publish_condition, PublishCondition}, - {topics, Topics}]. diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_protocol.erl b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_protocol.erl index 2ee61ec70..f14d6cb73 100644 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_protocol.erl +++ b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_protocol.erl @@ -301,7 +301,7 @@ auto_observe_object_list(Expected, Registered) -> send_auto_observe(CoapPid, RegInfo, EndpointName) -> %% - auto observe the objects Envs = proplists:get_value(config, lwm2m_coap_responder:options(), #{}), - case proplists:get_value(auto_observe, Envs, false) of + case maps:get(auto_observe, Envs, false) of false -> ?LOG(info, "Auto Observe Disabled", []); TrueOrObjList -> diff --git a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_sup.erl b/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_sup.erl deleted file mode 100644 index 0546e0080..000000000 --- a/apps/emqx_gateway/src/lwm2m/emqx_lwm2m_sup.erl +++ /dev/null @@ -1,39 +0,0 @@ -%%-------------------------------------------------------------------- -%% Copyright (c) 2020-2021 EMQ Technologies Co., Ltd. All Rights Reserved. -%% -%% Licensed under the Apache License, Version 2.0 (the "License"); -%% you may not use this file except in compliance with the License. -%% You may obtain a copy of the License at -%% -%% http://www.apache.org/licenses/LICENSE-2.0 -%% -%% Unless required by applicable law or agreed to in writing, software -%% distributed under the License is distributed on an "AS IS" BASIS, -%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -%% See the License for the specific language governing permissions and -%% limitations under the License. -%%-------------------------------------------------------------------- - --module(emqx_lwm2m_sup). - --behaviour(supervisor). - --export([ start_link/0 - , init/1 - ]). - --define(CHILD(M), {M, {M, start_link, []}, permanent, 5000, worker, [M]}). - - -start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). - -init(_Args) -> - CmSup = #{id => emqx_lwm2m_cm_sup, - start => {emqx_lwm2m_cm_sup, start_link, []}, - restart => permanent, - shutdown => infinity, - type => supervisor, - modules => [emqx_lwm2m_cm_sup] - }, - {ok, { {one_for_all, 10, 3600}, [?CHILD(emqx_lwm2m_xml_object_db), CmSup] }}.