yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(emqx_types): emqx_types:version() used but undefined.

This commit is contained in:
JimMoen 2021-09-16 14:27:11 +08:00
parent 1e8948e091
commit ba26a8511c
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/src/emqx_frame.erl
View File

@ -44,7 +44,7 @@
-type(options() :: #{strict_mode => boolean(),
max_size => 1..?MAX_PACKET_SIZE,
version => emqx_types:version()
version => emqx_types:proto_ver()
}).
-type(parse_state() :: {none, options()} | {cont_state(), options()}).
@ -490,7 +490,7 @@ serialize_pkt(Packet, #{version := Ver, max_size := MaxSize}) ->
-spec(serialize(emqx_types:packet()) -> iodata()).
serialize(Packet) -> serialize(Packet, ?MQTT_PROTO_V4).
-spec(serialize(emqx_types:packet(), emqx_types:version()) -> iodata()).
-spec(serialize(emqx_types:packet(), emqx_types:proto_ver()) -> iodata()).
serialize(#mqtt_packet{header = Header,
variable = Variable,
payload = Payload}, Ver) ->

2
apps/emqx/src/emqx_packet.erl
View File

@ -114,7 +114,7 @@ proto_name(#mqtt_packet_connect{proto_name = Name}) ->
Name.
%% @doc Protocol version of the CONNECT Packet.
-spec(proto_ver(emqx_types:packet()|connect()) -> emqx_types:version()).
-spec(proto_ver(emqx_types:packet()|connect()) -> emqx_types:proto_ver()).
proto_ver(?CONNECT_PACKET(ConnPkt)) ->
proto_ver(ConnPkt);
proto_ver(#mqtt_packet_connect{proto_ver = Ver}) ->

8
apps/emqx/src/emqx_types.erl
View File

@ -20,7 +20,7 @@
-include("emqx_mqtt.hrl").
-include("types.hrl").
-export_type([ ver/0
-export_type([ proto_ver/0
, qos/0
, qos_name/0
]).
@ -91,7 +91,7 @@
-export_type([oom_policy/0]).
-type(ver() :: ?MQTT_PROTO_V3
-type(proto_ver() :: ?MQTT_PROTO_V3
| ?MQTT_PROTO_V4
| ?MQTT_PROTO_V5
| non_neg_integer()
@ -116,7 +116,7 @@
peercert := nossl | undefined | esockd_peercert:peercert(),
conn_mod := module(),
proto_name => binary(),
proto_ver => ver(),
proto_ver => proto_ver(),
clean_start => boolean(),
clientid => clientid(),
username => username(),
@ -187,7 +187,7 @@
-type(message() :: #message{}).
-type(flag() :: sys | dup | retain | atom()).
-type(flags() :: #{flag() := boolean()}).
-type(headers() :: #{proto_ver => ver(),
-type(headers() :: #{proto_ver => proto_ver(),
protocol => protocol(),
username => username(),
peerhost => peerhost(),