fix(mqttsn): fix proto_name to MQTT-SN instead of MQTT (#4961)
This commit is contained in:
parent
0184a1b3e8
commit
42a6f2aba5
|
@ -1,6 +1,6 @@
|
||||||
{application, emqx_sn,
|
{application, emqx_sn,
|
||||||
[{description, "EMQ X MQTT-SN Plugin"},
|
[{description, "EMQ X MQTT-SN Plugin"},
|
||||||
{vsn, "4.3.2"}, % strict semver, bump manually!
|
{vsn, "4.3.3"}, % strict semver, bump manually!
|
||||||
{modules, []},
|
{modules, []},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{applications, [kernel,stdlib,esockd]},
|
{applications, [kernel,stdlib,esockd]},
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
%% -*-: erlang -*-
|
%% -*-: erlang -*-
|
||||||
{VSN,
|
{VSN,
|
||||||
[
|
[
|
||||||
|
{"4.3.2", [
|
||||||
|
{load_module, emqx_sn_gateway, brutal_purge, soft_purge, []}
|
||||||
|
]},
|
||||||
{<<"4.3.[0-1]">>, [
|
{<<"4.3.[0-1]">>, [
|
||||||
{restart_application, emqx_sn}
|
{restart_application, emqx_sn}
|
||||||
]}
|
]}
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
|
{"4.3.2", [
|
||||||
|
{load_module, emqx_sn_gateway, brutal_purge, soft_purge, []}
|
||||||
|
]},
|
||||||
{<<"4.3.[0-1]">>, [
|
{<<"4.3.[0-1]">>, [
|
||||||
{restart_application, emqx_sn}
|
{restart_application, emqx_sn}
|
||||||
]}
|
]}
|
||||||
|
|
|
@ -826,15 +826,17 @@ do_connect(ClientId, CleanStart, WillFlag, Duration, State) ->
|
||||||
clean_start = CleanStart,
|
clean_start = CleanStart,
|
||||||
username = State#state.username,
|
username = State#state.username,
|
||||||
password = State#state.password,
|
password = State#state.password,
|
||||||
|
proto_name = <<"MQTT-SN">>,
|
||||||
keepalive = Duration,
|
keepalive = Duration,
|
||||||
properties = OnlyOneInflight
|
properties = OnlyOneInflight,
|
||||||
|
proto_ver = 1
|
||||||
},
|
},
|
||||||
case WillFlag of
|
case WillFlag of
|
||||||
true -> State0 = send_message(?SN_WILLTOPICREQ_MSG(), State),
|
true -> State0 = send_message(?SN_WILLTOPICREQ_MSG(), State),
|
||||||
NState = State0#state{connpkt = ConnPkt,
|
NState = State0#state{connpkt = ConnPkt,
|
||||||
clientid = ClientId,
|
clientid = ClientId,
|
||||||
keepalive_interval = Duration
|
keepalive_interval = Duration
|
||||||
},
|
},
|
||||||
{next_state, wait_for_will_topic, NState};
|
{next_state, wait_for_will_topic, NState};
|
||||||
false ->
|
false ->
|
||||||
NState = State#state{clientid = ClientId,
|
NState = State#state{clientid = ClientId,
|
||||||
|
|
|
@ -30,11 +30,13 @@
|
||||||
%% MQTT Protocol Version and Names
|
%% MQTT Protocol Version and Names
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
|
|
||||||
|
-define(MQTT_SN_PROTO_V1, 1).
|
||||||
-define(MQTT_PROTO_V3, 3).
|
-define(MQTT_PROTO_V3, 3).
|
||||||
-define(MQTT_PROTO_V4, 4).
|
-define(MQTT_PROTO_V4, 4).
|
||||||
-define(MQTT_PROTO_V5, 5).
|
-define(MQTT_PROTO_V5, 5).
|
||||||
|
|
||||||
-define(PROTOCOL_NAMES, [
|
-define(PROTOCOL_NAMES, [
|
||||||
|
{?MQTT_SN_PROTO_V1, <<"MQTT-SN">>}, %% XXX:Compatible with emqx-sn plug-in
|
||||||
{?MQTT_PROTO_V3, <<"MQIsdp">>},
|
{?MQTT_PROTO_V3, <<"MQIsdp">>},
|
||||||
{?MQTT_PROTO_V4, <<"MQTT">>},
|
{?MQTT_PROTO_V4, <<"MQTT">>},
|
||||||
{?MQTT_PROTO_V5, <<"MQTT">>}]).
|
{?MQTT_PROTO_V5, <<"MQTT">>}]).
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{application, emqx,
|
{application, emqx,
|
||||||
[{id, "emqx"},
|
[{id, "emqx"},
|
||||||
{description, "EMQ X"},
|
{description, "EMQ X"},
|
||||||
{vsn, "4.3.3"}, % strict semver, bump manually!
|
{vsn, "4.3.4"}, % strict semver, bump manually!
|
||||||
{modules, []},
|
{modules, []},
|
||||||
{registered, []},
|
{registered, []},
|
||||||
{applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]},
|
{applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]},
|
||||||
|
|
|
@ -1,12 +1,17 @@
|
||||||
%% -*- mode: erlang -*-
|
%% -*- mode: erlang -*-
|
||||||
{VSN,
|
{VSN,
|
||||||
[{"4.3.2",
|
[
|
||||||
[{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
|
{"4.3.3",
|
||||||
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}]},
|
||||||
|
{"4.3.2",
|
||||||
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_app,brutal_purge,soft_purge,[]},
|
{load_module,emqx_app,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.1",
|
{"4.3.1",
|
||||||
[{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
|
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_cm,brutal_purge,soft_purge,[]},
|
{load_module,emqx_cm,brutal_purge,soft_purge,[]},
|
||||||
|
@ -18,7 +23,8 @@
|
||||||
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
|
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.0",
|
{"4.3.0",
|
||||||
[{load_module,emqx_logger_jsonfmt,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_logger_jsonfmt,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_congestion,brutal_purge,soft_purge,[]},
|
{load_module,emqx_congestion,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||||
|
@ -34,13 +40,17 @@
|
||||||
{apply,{emqx_metrics,upgrade_retained_delayed_counter_type,[]}},
|
{apply,{emqx_metrics,upgrade_retained_delayed_counter_type,[]}},
|
||||||
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
||||||
{<<".*">>,[]}],
|
{<<".*">>,[]}],
|
||||||
[{"4.3.2",
|
[{"4.3.3",
|
||||||
[{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}]},
|
||||||
|
{"4.3.2",
|
||||||
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_app,brutal_purge,soft_purge,[]},
|
{load_module,emqx_app,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.1",
|
{"4.3.1",
|
||||||
[{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
|
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_cm,brutal_purge,soft_purge,[]},
|
{load_module,emqx_cm,brutal_purge,soft_purge,[]},
|
||||||
|
@ -52,7 +62,8 @@
|
||||||
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
|
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
|
||||||
{"4.3.0",
|
{"4.3.0",
|
||||||
[{load_module,emqx_logger_jsonfmt,brutal_purge,soft_purge,[]},
|
[{load_module,emqx_packet,brutal_purge,soft_purge,[]},
|
||||||
|
{load_module,emqx_logger_jsonfmt,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||||
{load_module,emqx_congestion,brutal_purge,soft_purge,[]},
|
{load_module,emqx_congestion,brutal_purge,soft_purge,[]},
|
||||||
|
|
Loading…
Reference in New Issue