From d43a1d0f7b8ae5a2fb32f54782c04f7a385b2b83 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Thu, 8 Apr 2021 12:21:40 -0400 Subject: [PATCH] WIFI-1994: NAS-ID use BSSID as default, to support EAP with 11r --- .../wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java index b15e9ba..42c228a 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java @@ -182,9 +182,13 @@ public class OvsdbSsidConfig extends OvsdbDaoBase { defaultWanInterfaceName); if (radiusNasId != null) { - if (radiusNasId.equals(NasIdType.DEFAULT.toString())) { + if (radiusNasId.equals(NasIdType.AP_BASE_MAC.toString())) { + LOG.info("NAS-ID is {}, set radius_nas_id to {}", radiusNasId, partialConnectNode.macAddress); customOptions.put("radius_nas_id", partialConnectNode.macAddress); + } else if (radiusNasId.equals(NasIdType.DEFAULT.toString()) || radiusNasId.equals(NasIdType.BSSID.toString())) { + LOG.info("NAS-ID is {}, do not configure, AP will determine radius_nas_id when SSID configuration complete.", radiusNasId); } else { + LOG.info("NAS-ID is USER_DEFINED, set radius_nas_id to provided value {}.", radiusNasId); customOptions.put("radius_nas_id", radiusNasId); } }