From cf4538b5857a08aa633b83d060681f3f2ad29800 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Fri, 28 Aug 2015 07:08:01 -0700 Subject: [PATCH] Fix wireless devices connecting to WLAN when no ssid is set --- EduNetworkBuilder/NetworkDevice.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/EduNetworkBuilder/NetworkDevice.cs b/EduNetworkBuilder/NetworkDevice.cs index 12bf399..b684909 100644 --- a/EduNetworkBuilder/NetworkDevice.cs +++ b/EduNetworkBuilder/NetworkDevice.cs @@ -183,7 +183,9 @@ namespace EduNetworkBuilder CanAddNics = true; setNicsCanUseDHCP(true); } - if (myType == NetworkComponentType.net_switch || myType == NetworkComponentType.net_hub) + if (myType == NetworkComponentType.net_switch || myType == NetworkComponentType.net_hub || + myType == NetworkComponentType.wap || myType == NetworkComponentType.wbridge || + myType == NetworkComponentType.wrepeater) { CanServeDHCP = false; CanUseDHCP = true; @@ -720,6 +722,8 @@ namespace EduNetworkBuilder public NetworkCard HasWPortSSIDKey(string SSID, string Key) { + if (SSID == null) return null; + if (Key == null) return null; foreach(NetworkCard nic in NICs) { if(nic.GetNicType == NicType.wport && !nic.isConnected(false)) @@ -1012,10 +1016,14 @@ namespace EduNetworkBuilder { if (myType == NetworkComponentType.net_hub) return true; if (myType == NetworkComponentType.net_switch) return true; - if (myType == NetworkComponentType.wap) return true; - if (myType == NetworkComponentType.wbridge) return true; - if (myType == NetworkComponentType.wrepeater) return true; - if (myType == NetworkComponentType.wrouter) return true; + if (myType == NetworkComponentType.wap) + return true; + if (myType == NetworkComponentType.wbridge) + return true; + if (myType == NetworkComponentType.wrepeater) + return true; + if (myType == NetworkComponentType.wrouter) + return true; return false; }