2 роки тому · 0a62d6c556
--- a/apps/emqx_gateway_coap/.gitignore
+++ b/apps/emqx_gateway_coap/.gitignore
--- a/apps/emqx_gateway_coap/README.md
+++ b/apps/emqx_gateway_coap/README.md
--- a/apps/emqx_gateway_coap/doc/flow.png
+++ b/apps/emqx_gateway_coap/doc/flow.png
--- a/apps/emqx_gateway_coap/doc/shared_state.png
+++ b/apps/emqx_gateway_coap/doc/shared_state.png
--- a/apps/emqx_gateway_coap/doc/transport.png
+++ b/apps/emqx_gateway_coap/doc/transport.png
--- a/apps/emqx_gateway_coap/include/emqx_coap.hrl
+++ b/apps/emqx_gateway_coap/include/emqx_coap.hrl
--- a/apps/emqx_gateway_coap/rebar.config
+++ b/apps/emqx_gateway_coap/rebar.config
--- a/apps/emqx_gateway_coap/src/emqx_coap_api.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_api.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_channel.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_frame.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_frame.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_medium.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_medium.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_message.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_message.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_mqtt_handler.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_mqtt_handler.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_observe_res.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_observe_res.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_pubsub_handler.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_pubsub_handler.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_schema.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_session.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_session.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_tm.erl
--- a/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
+++ b/apps/emqx_gateway_coap/src/emqx_coap_transport.erl
--- a/apps/emqx_coap/src/emqx_coap.app.src
+++ b/apps/emqx_coap/src/emqx_coap.app.src
@@ -1,4 +1,4 @@
 
				-{application, emqx_coap, [
			
 
				+{application, emqx_gateway_coap, [
			
 
				     {description, "CoAP Gateway"},
			
 
				     {vsn, "0.1.0"},
			
 
				     {registered, []},
			
--- a/apps/emqx_coap/src/emqx_coap.erl
+++ b/apps/emqx_coap/src/emqx_coap.erl
@@ -15,7 +15,7 @@
 
				 %%--------------------------------------------------------------------
			
 
				 
			
 
				 %% @doc The CoAP Gateway implement
			
 
				--module(emqx_coap).
			
 
				+-module(emqx_gateway_coap).
			
 
				 
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
			
--- a/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
+++ b/apps/emqx_gateway_coap/test/emqx_coap_SUITE.erl
--- a/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
+++ b/apps/emqx_gateway_coap/test/emqx_coap_api_SUITE.erl
--- a/apps/emqx_gateway_exproto/.gitignore
+++ b/apps/emqx_gateway_exproto/.gitignore
--- a/apps/emqx_gateway_exproto/README.md
+++ b/apps/emqx_gateway_exproto/README.md
--- a/apps/emqx_gateway_exproto/include/emqx_exproto.hrl
+++ b/apps/emqx_gateway_exproto/include/emqx_exproto.hrl
--- a/apps/emqx_gateway_exproto/priv/protos/exproto.proto
+++ b/apps/emqx_gateway_exproto/priv/protos/exproto.proto
--- a/apps/emqx_gateway_exproto/rebar.config
+++ b/apps/emqx_gateway_exproto/rebar.config
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_channel.erl
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_frame.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_frame.erl
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_gcli.erl
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_gsvr.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_gsvr.erl
--- a/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
+++ b/apps/emqx_gateway_exproto/src/emqx_exproto_schema.erl
--- a/apps/emqx_exproto/src/emqx_exproto.app.src
+++ b/apps/emqx_exproto/src/emqx_exproto.app.src
@@ -1,4 +1,4 @@
 
				-{application, emqx_exproto, [
			
 
				+{application, emqx_gateway_exproto, [
			
 
				     {description, "ExProto Gateway"},
			
 
				     {vsn, "0.1.0"},
			
 
				     {registered, []},
			
--- a/apps/emqx_exproto/src/emqx_exproto.erl
+++ b/apps/emqx_exproto/src/emqx_exproto.erl
@@ -15,7 +15,7 @@
 
				 %%--------------------------------------------------------------------
			
 
				 
			
 
				 %% @doc The ExProto Gateway implement
			
 
				--module(emqx_exproto).
			
 
				+-module(emqx_gateway_exproto).
			
 
				 
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
			
--- a/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
+++ b/apps/emqx_gateway_exproto/test/emqx_exproto_SUITE.erl
--- a/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
+++ b/apps/emqx_gateway_exproto/test/emqx_exproto_echo_svr.erl
--- a/apps/emqx_gateway_lwm2m/.gitignore
+++ b/apps/emqx_gateway_lwm2m/.gitignore
--- a/apps/emqx_gateway_lwm2m/README.md
+++ b/apps/emqx_gateway_lwm2m/README.md
--- a/apps/emqx_gateway_lwm2m/include/emqx_lwm2m.hrl
+++ b/apps/emqx_gateway_lwm2m/include/emqx_lwm2m.hrl
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Access_Control-v1_0_1.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Connectivity_Statistics-v1_0_1.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Device-v1_0_1.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Firmware_Update-v1_0_1.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Location-v1_0.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Security-v1_0.xml
--- a/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml
+++ b/apps/emqx_gateway_lwm2m/lwm2m_xml/LWM2M_Server-v1_0.xml
--- a/apps/emqx_gateway_lwm2m/rebar.config
+++ b/apps/emqx_gateway_lwm2m/rebar.config
--- a/apps/emqx_gateway_lwm2m/src/binary_util.erl
+++ b/apps/emqx_gateway_lwm2m/src/binary_util.erl
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
@@ -1,8 +1,8 @@
 
				-{application, emqx_lwm2m, [
			
 
				+{application, emqx_gateway_lwm2m, [
			
 
				     {description, "LwM2M Gateway"},
			
 
				     {vsn, "0.1.0"},
			
 
				     {registered, []},
			
 
				-    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_coap]},
			
 
				+    {applications, [kernel, stdlib, emqx, emqx_gateway, emqx_gateway_coap]},
			
 
				     {env, []},
			
 
				     {modules, []},
			
 
				     {licenses, ["Apache 2.0"]},
			
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m.erl
@@ -15,7 +15,7 @@
 
				 %%--------------------------------------------------------------------
			
 
				 
			
 
				 %% @doc The LwM2M Gateway implement
			
 
				--module(emqx_lwm2m).
			
 
				+-module(emqx_gateway_lwm2m).
			
 
				 
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				 -include_lib("emqx_gateway/include/emqx_gateway.hrl").
			
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_api.erl
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_channel.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m_channel.erl
@@ -18,7 +18,7 @@
 
				 
			
 
				 -include("emqx_lwm2m.hrl").
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				--include_lib("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 
			
 
				 %% API
			
 
				 -export([
			
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_cmd.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m_cmd.erl
@@ -18,7 +18,7 @@
 
				 
			
 
				 -include("emqx_lwm2m.hrl").
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				--include_lib("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 
			
 
				 -export([
			
 
				     mqtt_to_coap/2,
			
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_message.erl
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_schema.erl
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_session.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m_session.erl
@@ -20,7 +20,7 @@
 
				 -include_lib("emqx/include/emqx.hrl").
			
 
				 -include_lib("emqx/include/emqx_mqtt.hrl").
			
 
				 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
			
 
				--include_lib("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 
			
 
				 %% API
			
 
				 -export([
			
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_tlv.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_tlv.erl
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object.erl
--- a/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object_db.erl
+++ b/apps/emqx_gateway_lwm2m/src/emqx_lwm2m_xml_object_db.erl
--- a/apps/emqx_lwm2m/test/emqx_lwm2m_SUITE.erl
+++ b/apps/emqx_lwm2m/test/emqx_lwm2m_SUITE.erl
@@ -32,7 +32,7 @@
 
				 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
			
 
				 
			
 
				 -include("emqx_lwm2m.hrl").
			
 
				--include_lib("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include_lib("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 -include_lib("eunit/include/eunit.hrl").
			
 
				 -include_lib("common_test/include/ct.hrl").
			
 
				 -include_lib("snabbkaffe/include/snabbkaffe.hrl").
			
--- a/apps/emqx_lwm2m/test/emqx_lwm2m_api_SUITE.erl
+++ b/apps/emqx_lwm2m/test/emqx_lwm2m_api_SUITE.erl
@@ -24,7 +24,7 @@
 
				 -define(LOGT(Format, Args), ct:pal("TEST_SUITE: " ++ Format, Args)).
			
 
				 
			
 
				 -include("emqx_lwm2m.hrl").
			
 
				--include("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 -include_lib("eunit/include/eunit.hrl").
			
 
				 -include_lib("common_test/include/ct.hrl").
			
 
				 
			
--- a/apps/emqx_lwm2m/test/emqx_tlv_SUITE.erl
+++ b/apps/emqx_lwm2m/test/emqx_tlv_SUITE.erl
@@ -22,7 +22,7 @@
 
				 -define(LOGT(Format, Args), logger:debug("TEST_SUITE: " ++ Format, Args)).
			
 
				 
			
 
				 -include("emqx_lwm2m.hrl").
			
 
				--include("emqx_coap/include/emqx_coap.hrl").
			
 
				+-include("emqx_gateway_coap/include/emqx_coap.hrl").
			
 
				 -include_lib("eunit/include/eunit.hrl").
			
 
				 
			
 
				 %%--------------------------------------------------------------------
			
--- a/apps/emqx_gateway_mqttsn/.gitignore
+++ b/apps/emqx_gateway_mqttsn/.gitignore
--- a/apps/emqx_gateway_mqttsn/README.md
+++ b/apps/emqx_gateway_mqttsn/README.md
--- a/apps/emqx_gateway_mqttsn/include/emqx_mqttsn.hrl
+++ b/apps/emqx_gateway_mqttsn/include/emqx_mqttsn.hrl
--- a/apps/emqx_gateway_mqttsn/rebar.config
+++ b/apps/emqx_gateway_mqttsn/rebar.config
--- a/apps/emqx_mqttsn/src/emqx_mqttsn.app.src
+++ b/apps/emqx_mqttsn/src/emqx_mqttsn.app.src
@@ -1,4 +1,4 @@
 
				-{application, emqx_mqttsn, [
			
 
				+{application, emqx_gateway_mqttsn, [
			
 
				     {description, "MQTT-SN Gateway"},
			
 
				     {vsn, "0.1.0"},
			
 
				     {registered, []},
			
--- a/apps/emqx_mqttsn/src/emqx_mqttsn.erl
+++ b/apps/emqx_mqttsn/src/emqx_mqttsn.erl
@@ -15,7 +15,7 @@
 
				 %%--------------------------------------------------------------------
			
 
				 
			
 
				 %% @doc The MQTT-SN Gateway implement interface
			
 
				--module(emqx_mqttsn).
			
 
				+-module(emqx_gateway_mqttsn).
			
 
				 
			
 
				 -include_lib("emqx/include/logger.hrl").
			
 
				 
			
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_broadcast.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_broadcast.erl
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_frame.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_frame.erl
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_registry.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_registry.erl
--- a/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
+++ b/apps/emqx_gateway_mqttsn/src/emqx_mqttsn_schema.erl
--- a/apps/emqx_gateway_mqttsn/test/broadcast_test.py
+++ b/apps/emqx_gateway_mqttsn/test/broadcast_test.py
--- a/apps/emqx_gateway_mqttsn/test/emqx_sn_frame_SUITE.erl
+++ b/apps/emqx_gateway_mqttsn/test/emqx_sn_frame_SUITE.erl
--- a/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
+++ b/apps/emqx_gateway_mqttsn/test/emqx_sn_protocol_SUITE.erl
--- a/apps/emqx_gateway_mqttsn/test/emqx_sn_registry_SUITE.erl
+++ b/apps/emqx_gateway_mqttsn/test/emqx_sn_registry_SUITE.erl
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/Makefile
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/Makefile
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/README.md
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/README.md
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/add_emqx_sn_to_project.py
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/add_emqx_sn_to_project.py
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0pub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0pub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0sub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case1_qos0sub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0pub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0pub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0sub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case2_qos0sub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0pub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0pub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0sub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case3_qos0sub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3pub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3pub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3sub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case4_qos3sub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3pub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3pub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3sub.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case5_qos3sub.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case6_sleep.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case6_sleep.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/case7_double_connect.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/case7_double_connect.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.c
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.c
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.h
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/client/int_test_result.h
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/disable_qos3.py
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/disable_qos3.py
--- a/apps/emqx_gateway_mqttsn/test/intergration_test/enable_qos3.py
+++ b/apps/emqx_gateway_mqttsn/test/intergration_test/enable_qos3.py
--- a/apps/emqx_gateway_mqttsn/test/props/emqx_sn_proper_types.erl
+++ b/apps/emqx_gateway_mqttsn/test/props/emqx_sn_proper_types.erl
--- a/apps/emqx_gateway_mqttsn/test/props/prop_emqx_sn_frame.erl
+++ b/apps/emqx_gateway_mqttsn/test/props/prop_emqx_sn_frame.erl
--- a/apps/emqx_stomp/.gitignore
+++ b/apps/emqx_stomp/.gitignore