timy/EduNetworkBuilder
timy/EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wireless devices connecting to WLAN when no ssid is set

Browse Source
This commit is contained in:
Tim Young 2015-08-28 07:08:01 -07:00
parent e82403522b
commit cf4538b585
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
EduNetworkBuilder/NetworkDevice.cs
View File

@ -183,7 +183,9 @@ namespace EduNetworkBuilder
CanAddNics = true; CanAddNics = true;
setNicsCanUseDHCP(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; CanServeDHCP = false;
CanUseDHCP = true; CanUseDHCP = true;
@ -720,6 +722,8 @@ namespace EduNetworkBuilder
public NetworkCard HasWPortSSIDKey(string SSID, string Key) public NetworkCard HasWPortSSIDKey(string SSID, string Key)
{ {
if (SSID == null) return null;
if (Key == null) return null;
foreach(NetworkCard nic in NICs) foreach(NetworkCard nic in NICs)
{ {
if(nic.GetNicType == NicType.wport && !nic.isConnected(false)) 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_hub) return true;
if (myType == NetworkComponentType.net_switch) return true; if (myType == NetworkComponentType.net_switch) return true;
if (myType == NetworkComponentType.wap) return true; if (myType == NetworkComponentType.wap)
if (myType == NetworkComponentType.wbridge) return true; return true;
if (myType == NetworkComponentType.wrepeater) return true; if (myType == NetworkComponentType.wbridge)
if (myType == NetworkComponentType.wrouter) return true; return true;
if (myType == NetworkComponentType.wrepeater)
return true;
if (myType == NetworkComponentType.wrouter)
return true;
return false; return false;
} }