From bcae0cbb50d924272686f12d92101c385b5d88a9 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Thu, 15 Jul 2021 14:26:12 +0800
Subject: [PATCH] fix(gateways): hardcode the listener and zone names

---
 apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl | 3 ++-
 apps/emqx_exproto/src/emqx_exproto_conn.erl   | 3 ++-
 apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl b/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl
index 315cfbb5c..3d09d0f92 100644
--- a/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl
+++ b/apps/emqx_coap/src/emqx_coap_mqtt_adapter.erl
@@ -371,7 +371,8 @@ clientinfo(#state{peername = {PeerHost, _},
                   clientid = ClientId,
                   username = Username,
                   password = Password}) ->
-    #{zone => undefined,
+    #{zone => default,
+      listener => mqtt_tcp, %% FIXME: this won't work
       protocol => coap,
       peerhost => PeerHost,
       sockport => 5683,      %% FIXME:
diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl
index da655bcb4..256a69b30 100644
--- a/apps/emqx_exproto/src/emqx_exproto_conn.erl
+++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl
@@ -219,7 +219,8 @@ send(Data, #state{socket = {esockd_transport, Sock}}) ->
 
 -define(DEFAULT_GC_OPTS, #{count => 1000, bytes => 1024*1024}).
 -define(DEFAULT_IDLE_TIMEOUT, 30000).
--define(DEFAULT_OOM_POLICY, #{max_heap_size => 4194304,message_queue_len => 32000}).
+-define(DEFAULT_OOM_POLICY, #{enable => true, max_heap_size => 4194304,
+    max_message_queue_len => 32000}).
 
 init(Parent, WrappedSock, Peername, Options) ->
     case esockd_wait(WrappedSock) of
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl b/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl
index 34c72dcca..cacc21a9d 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m_protocol.erl
@@ -441,7 +441,8 @@ take_place(Text, Placeholder, Value) ->
 clientinfo(#lwm2m_state{peername = {PeerHost, _},
                         endpoint_name = EndpointName,
                         mountpoint = Mountpoint}) ->
-    #{zone => undefined,
+    #{zone => default,
+      listener => mqtt_tcp, %% FIXME: this won't work
       protocol => lwm2m,
       peerhost => PeerHost,
       sockport => 5683,         %% FIXME: