From 9355adae4bd36b7d1ad9ddf04e562faf28abb616 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 20 Jul 2021 15:41:45 +0800 Subject: [PATCH] fix(gw): fix xrefs --- apps/emqx_gateway/src/mqttsn/emqx_sn_broadcast.erl | 2 +- apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/emqx_gateway/src/mqttsn/emqx_sn_broadcast.erl b/apps/emqx_gateway/src/mqttsn/emqx_sn_broadcast.erl index 69eb9a2c5..f890cc774 100644 --- a/apps/emqx_gateway/src/mqttsn/emqx_sn_broadcast.erl +++ b/apps/emqx_gateway/src/mqttsn/emqx_sn_broadcast.erl @@ -89,7 +89,7 @@ ensure_advertise(State = #state{duration = Duration}) -> send_advertise(#state{gwid = GwId, sock = Sock, port = Port, addrs = Addrs, duration = Duration}) -> - Data = emqx_sn_frame:serialize(?SN_ADVERTISE_MSG(GwId, Duration)), + Data = emqx_sn_frame:serialize_pkt(?SN_ADVERTISE_MSG(GwId, Duration), #{}), lists:foreach(fun(Addr) -> ?LOG(debug, "SEND SN_ADVERTISE to ~p~n", [Addr]), gen_udp:send(Sock, Addr, Port, Data) diff --git a/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl b/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl index f2d548409..c1588f364 100644 --- a/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl +++ b/apps/emqx_gateway/src/mqttsn/emqx_sn_channel.erl @@ -1095,8 +1095,8 @@ handle_call(discard, Channel) -> % AllPendings = lists:append(Delivers, Pendings), % shutdown_and_reply(takeovered, AllPendings, Channel); -handle_call(list_acl_cache, Channel) -> - {reply, emqx_acl_cache:list_acl_cache(), Channel}; +%handle_call(list_acl_cache, Channel) -> +% {reply, emqx_acl_cache:list_acl_cache(), Channel}; %% XXX: No Quota Now % handle_call({quota, Policy}, Channel) -> @@ -1375,7 +1375,7 @@ run_hooks(Ctx, Name, Args, Acc) -> emqx_hooks:run_fold(Name, Args, Acc). run_hooks_without_metrics(_Ctx, Name, Args) -> - emqx_hooks:run_fold(Name, Args). + emqx_hooks:run(Name, Args). run_hooks_without_metrics(_Ctx, Name, Args, Acc) -> emqx_hooks:run_fold(Name, Args, Acc).