chore(gw-lwm2m): store lifetime in clientinfo
This commit is contained in:
parent
cfc905aa1a
commit
92a5c333af
|
@ -57,7 +57,7 @@
|
||||||
%% TODO:
|
%% TODO:
|
||||||
-define(DEFAULT_OVERRIDE,
|
-define(DEFAULT_OVERRIDE,
|
||||||
#{ clientid => <<"">> %% Generate clientid by default
|
#{ clientid => <<"">> %% Generate clientid by default
|
||||||
, username => <<"${Packet.querystring.epn}">>
|
, username => <<"${Packet.uri_query.ep}">>
|
||||||
, password => <<"">>
|
, password => <<"">>
|
||||||
}).
|
}).
|
||||||
|
|
||||||
|
@ -300,13 +300,14 @@ enrich_clientinfo(#coap_message{options = Options} = Msg,
|
||||||
Channel = #channel{clientinfo = ClientInfo0}) ->
|
Channel = #channel{clientinfo = ClientInfo0}) ->
|
||||||
Query = maps:get(uri_query, Options, #{}),
|
Query = maps:get(uri_query, Options, #{}),
|
||||||
case Query of
|
case Query of
|
||||||
#{<<"ep">> := Epn} ->
|
#{<<"ep">> := Epn, <<"lt">> := Lifetime} ->
|
||||||
%% TODO: put endpoint-name, lifetime into clientinfo ???
|
|
||||||
Username = maps:get(<<"imei">>, Query, Epn),
|
Username = maps:get(<<"imei">>, Query, Epn),
|
||||||
Password = maps:get(<<"password">>, Query, undefined),
|
Password = maps:get(<<"password">>, Query, undefined),
|
||||||
ClientId = maps:get(<<"device_id">>, Query, Epn),
|
ClientId = maps:get(<<"device_id">>, Query, Epn),
|
||||||
ClientInfo =
|
ClientInfo =
|
||||||
ClientInfo0#{username => Username,
|
ClientInfo0#{endpoint_name => Epn,
|
||||||
|
lifetime => binary_to_integer(Lifetime),
|
||||||
|
username => Username,
|
||||||
password => Password,
|
password => Password,
|
||||||
clientid => ClientId},
|
clientid => ClientId},
|
||||||
{ok, NClientInfo} = fix_mountpoint(Msg, ClientInfo),
|
{ok, NClientInfo} = fix_mountpoint(Msg, ClientInfo),
|
||||||
|
|
|
@ -345,7 +345,7 @@ update(#coap_message{options = Opts, payload = Payload} = Msg,
|
||||||
WithContext,
|
WithContext,
|
||||||
CmdType,
|
CmdType,
|
||||||
#session{reg_info = OldRegInfo} = Session) ->
|
#session{reg_info = OldRegInfo} = Session) ->
|
||||||
Query = maps:get(uri_query, Opts),
|
Query = maps:get(uri_query, Opts, #{}),
|
||||||
RegInfo = append_object_list(Query, Payload),
|
RegInfo = append_object_list(Query, Payload),
|
||||||
UpdateRegInfo = maps:merge(OldRegInfo, RegInfo),
|
UpdateRegInfo = maps:merge(OldRegInfo, RegInfo),
|
||||||
LifeTime = get_lifetime(UpdateRegInfo, OldRegInfo),
|
LifeTime = get_lifetime(UpdateRegInfo, OldRegInfo),
|
||||||
|
|
Loading…
Reference in New Issue