From ff8aa5eb420c11be6e65e205dc442b5ce4a82d6d Mon Sep 17 00:00:00 2001
From: Craig Pratt <c.pratt@cablelabs.com>
Date: Mon, 27 Feb 2023 22:50:21 -0800
Subject: [PATCH] Enabled DPP for all wireless configs and reduced PSK lookout
 timeout (v1.2.1)

---
 distribution/Makefile          | 2 +-
 micronets-gw-service/config.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/distribution/Makefile b/distribution/Makefile
index f637ba3..ef9e0b3 100644
--- a/distribution/Makefile
+++ b/distribution/Makefile
@@ -1,6 +1,6 @@
 .PHONY: all clean distclean deb scp
 
-VERSION=1.2.0
+VERSION=1.2.1
 DIST=U18.04+
 FBASE=micronets-gw
 SDIRS=../filesystem
diff --git a/micronets-gw-service/config.py b/micronets-gw-service/config.py
index 8bd1d27..0b6bbe7 100644
--- a/micronets-gw-service/config.py
+++ b/micronets-gw-service/config.py
@@ -69,7 +69,7 @@ class NetreachDefaultSettings():
     NETREACH_ADAPTER_USE_DEVICE_PASS = True
     NETREACH_ADAPTER_PSK_LOOKUP_TIMEOUT_S = 4
     NETREACH_ADAPTER_PSK_CACHE_ENABLED = True
-    NETREACH_ADAPTER_PSK_CACHE_EXPIRE_S = 60
+    NETREACH_ADAPTER_PSK_CACHE_EXPIRE_S = 30
     NETREACH_ADAPTER_VXLAN_PEER_INAME_PREFIX = "nap."
     NETREACH_ADAPTER_VXLAN_PEER_INAME_FORMAT = "nap.{short_ap_id}.{vlan:x}"
     NETREACH_ADAPTER_VXLAN_NET_BRIDGE = "brhapd"
@@ -157,7 +157,7 @@ class WiredGatewayConfigWithWebsocketLookup (WiredGatewayConfig):
 
 class WirelessGatewayConfig (ReferenceGatewaySettings):
     # Note: No websocket connection is setup
-    DPP_ADAPTER_ENABLED = False
+    DPP_ADAPTER_ENABLED = True
     FLOW_ADAPTER_ENABLED = True
     HOSTAPD_ADAPTER_ENABLED = True
     DEBUG = False