From 8c0e1f62fcc5013883cee82e9a9c3d4cf5025237 Mon Sep 17 00:00:00 2001
From: James Prestwood <james.prestwood@linux.intel.com>
Date: Wed, 26 Jun 2019 15:15:58 -0700
Subject: [PATCH] network: allow connections to hotspot networks

---
 src/network.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/network.c b/src/network.c
index 66e66f04..f4166796 100644
--- a/src/network.c
+++ b/src/network.c
@@ -49,6 +49,7 @@
 #include "src/network.h"
 #include "src/blacklist.h"
 #include "src/util.h"
+#include "src/hotspot.h"
 
 struct network {
 	char *object_path;
@@ -75,8 +76,23 @@ static bool network_settings_load(struct network *network)
 	if (network->settings)
 		return true;
 
-	network->settings = storage_network_open(network_get_security(network),
-							network->info->ssid);
+	/*
+	 * If this network contains NAI realm info OR we have a Hotspot
+	 * provisioning file containing the HESSID we know this is a Hotspot
+	 * network.
+	 */
+	if (network->nai_realms || !util_mem_is_zero(network->hessid, 6)) {
+		network->settings = l_settings_new();
+
+		if (!l_settings_load_from_file(network->settings,
+					hs20_find_settings_file(network))) {
+			l_settings_free(network->settings);
+			network->settings = NULL;
+		}
+	} else
+		network->settings = storage_network_open(
+						network_get_security(network),
+						network->info->ssid);
 
 	return network->settings != NULL;
 }