From 18edf5cec3fd9eb86091ba164c6516ca82f94767 Mon Sep 17 00:00:00 2001 From: terry-xiaoyu <506895667@qq.com> Date: Sat, 21 Sep 2019 12:20:20 +0800 Subject: [PATCH] Add protocol in client object --- src/emqx_channel.erl | 3 ++- src/emqx_types.erl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/emqx_channel.erl b/src/emqx_channel.erl index 89d3a895d..edd08baa6 100644 --- a/src/emqx_channel.erl +++ b/src/emqx_channel.erl @@ -172,7 +172,7 @@ set_field(Name, Val, Channel) -> %%-------------------------------------------------------------------- -spec(init(emqx_types:conninfo(), proplists:proplist()) -> channel()). -init(ConnInfo = #{peername := {PeerHost, _Port}}, Options) -> +init(ConnInfo = #{peername := {PeerHost, _Port}, protocol := Protocol}, Options) -> Zone = proplists:get_value(zone, Options), Peercert = maps:get(peercert, ConnInfo, undefined), Username = case peer_cert_as_username(Options) of @@ -183,6 +183,7 @@ init(ConnInfo = #{peername := {PeerHost, _Port}}, Options) -> end, MountPoint = emqx_zone:get_env(Zone, mountpoint), ClientInfo = #{zone => Zone, + protocol => Protocol, peerhost => PeerHost, peercert => Peercert, client_id => undefined, diff --git a/src/emqx_types.erl b/src/emqx_types.erl index 58b438010..27f3c7b2e 100644 --- a/src/emqx_types.erl +++ b/src/emqx_types.erl @@ -103,6 +103,7 @@ atom() => term() }). -type(client() :: #{zone := zone(), + protocol := protocol(), peerhost := peerhost(), client_id := client_id(), username := username(), @@ -121,7 +122,7 @@ -type(password() :: maybe(binary())). -type(peerhost() :: inet:ip_address()). -type(peername() :: {inet:ip_address(), inet:port_number()}). --type(protocol() :: mqtt | 'mqtt-sn' | coap | stomp | none | atom()). +-type(protocol() :: mqtt | 'mqtt-sn' | coap | lwm2m | stomp | none | atom()). -type(auth_result() :: success | client_identifier_not_valid | bad_username_or_password