\r
#include "WifiConnectionMgrDxe.h"\r
\r
-EFI_EAP_TYPE mEapAuthMethod[] = {\r
+EFI_EAP_TYPE mEapAuthMethod[] = {\r
EFI_EAP_TYPE_TTLS,\r
EFI_EAP_TYPE_PEAP,\r
EFI_EAP_TYPE_EAPTLS\r
};\r
\r
-EFI_EAP_TYPE mEapSecondAuthMethod[] = {\r
+EFI_EAP_TYPE mEapSecondAuthMethod[] = {\r
EFI_EAP_TYPE_MSCHAPV2\r
};\r
\r
VOID\r
EFIAPI\r
WifiMgrOnScanFinished (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EFI_STATUS Status;\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
- WIFI_MGR_DEVICE_DATA *Nic;\r
- WIFI_MGR_NETWORK_PROFILE *Profile;\r
- EFI_80211_NETWORK *Network;\r
- UINTN DataSize;\r
- EFI_80211_NETWORK_DESCRIPTION *NetworkDescription;\r
- EFI_80211_GET_NETWORKS_RESULT *Result;\r
- LIST_ENTRY *Entry;\r
- UINT8 SecurityType;\r
- BOOLEAN AKMSuiteSupported;\r
- BOOLEAN CipherSuiteSupported;\r
- CHAR8 *AsciiSSId;\r
- UINTN Index;\r
+ EFI_STATUS Status;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ WIFI_MGR_DEVICE_DATA *Nic;\r
+ WIFI_MGR_NETWORK_PROFILE *Profile;\r
+ EFI_80211_NETWORK *Network;\r
+ UINTN DataSize;\r
+ EFI_80211_NETWORK_DESCRIPTION *NetworkDescription;\r
+ EFI_80211_GET_NETWORKS_RESULT *Result;\r
+ LIST_ENTRY *Entry;\r
+ UINT8 SecurityType;\r
+ BOOLEAN AKMSuiteSupported;\r
+ BOOLEAN CipherSuiteSupported;\r
+ CHAR8 *AsciiSSId;\r
+ UINTN Index;\r
\r
ASSERT (Context != NULL);\r
\r
- ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *) Context;\r
+ ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
ASSERT (ConfigToken->Nic != NULL);\r
ASSERT (ConfigToken->Type == TokenTypeGetNetworksToken);\r
\r
//\r
// Clean previous result, and update network list according to the scan result\r
//\r
- Nic->AvailableCount = 0;\r
+ Nic->AvailableCount = 0;\r
\r
NET_LIST_FOR_EACH (Entry, &Nic->ProfileList) {\r
- Profile = NET_LIST_USER_STRUCT_S (Entry, WIFI_MGR_NETWORK_PROFILE,\r
- Link, WIFI_MGR_PROFILE_SIGNATURE);\r
+ Profile = NET_LIST_USER_STRUCT_S (\r
+ Entry,\r
+ WIFI_MGR_NETWORK_PROFILE,\r
+ Link,\r
+ WIFI_MGR_PROFILE_SIGNATURE\r
+ );\r
Profile->IsAvailable = FALSE;\r
}\r
\r
if (Result == NULL) {\r
gBS->SignalEvent (Nic->Private->NetworkListRefreshEvent);\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
return;\r
}\r
\r
- for (Index = 0; Index < Result->NumOfNetworkDesc; Index ++) {\r
-\r
+ for (Index = 0; Index < Result->NumOfNetworkDesc; Index++) {\r
NetworkDescription = Result->NetworkDesc + Index;\r
if (NetworkDescription == NULL) {\r
continue;\r
}\r
\r
Network = &NetworkDescription->Network;\r
- if (Network == NULL || Network->SSId.SSIdLen == 0) {\r
+ if ((Network == NULL) || (Network->SSId.SSIdLen == 0)) {\r
continue;\r
}\r
\r
&CipherSuiteSupported\r
);\r
if (EFI_ERROR (Status)) {\r
-\r
- SecurityType = SECURITY_TYPE_UNKNOWN;\r
- AKMSuiteSupported = FALSE;\r
- CipherSuiteSupported = FALSE;\r
+ SecurityType = SECURITY_TYPE_UNKNOWN;\r
+ AKMSuiteSupported = FALSE;\r
+ CipherSuiteSupported = FALSE;\r
}\r
\r
- AsciiSSId = (CHAR8*) AllocateZeroPool(sizeof (CHAR8) * (Network->SSId.SSIdLen + 1));\r
+ AsciiSSId = (CHAR8 *)AllocateZeroPool (sizeof (CHAR8) * (Network->SSId.SSIdLen + 1));\r
if (AsciiSSId == NULL) {\r
continue;\r
}\r
- CopyMem(AsciiSSId, (CHAR8 *) Network->SSId.SSId, sizeof (CHAR8) * Network->SSId.SSIdLen);\r
+\r
+ CopyMem (AsciiSSId, (CHAR8 *)Network->SSId.SSId, sizeof (CHAR8) * Network->SSId.SSIdLen);\r
*(AsciiSSId + Network->SSId.SSIdLen) = '\0';\r
\r
Profile = WifiMgrGetProfileByAsciiSSId (AsciiSSId, SecurityType, &Nic->ProfileList);\r
if (Profile == NULL) {\r
-\r
if (Nic->MaxProfileIndex >= NETWORK_LIST_COUNT_MAX) {\r
FreePool (AsciiSSId);\r
continue;\r
FreePool (AsciiSSId);\r
continue;\r
}\r
+\r
Profile->Signature = WIFI_MGR_PROFILE_SIGNATURE;\r
Profile->NicIndex = Nic->NicIndex;\r
Profile->ProfileIndex = Nic->MaxProfileIndex + 1;\r
AsciiStrToUnicodeStrS (AsciiSSId, Profile->SSId, SSID_STORAGE_SIZE);\r
InsertTailList (&Nic->ProfileList, &Profile->Link);\r
- Nic->MaxProfileIndex ++;\r
+ Nic->MaxProfileIndex++;\r
}\r
+\r
FreePool (AsciiSSId);\r
\r
//\r
- //May receive duplicate networks in scan results, check if it has already\r
- //been processed.\r
+ // May receive duplicate networks in scan results, check if it has already\r
+ // been processed.\r
//\r
if (!Profile->IsAvailable) {\r
-\r
Profile->IsAvailable = TRUE;\r
Profile->SecurityType = SecurityType;\r
Profile->AKMSuiteSupported = AKMSuiteSupported;\r
Profile->CipherSuiteSupported = CipherSuiteSupported;\r
Profile->NetworkQuality = NetworkDescription->NetworkQuality;\r
- Nic->AvailableCount ++;\r
+ Nic->AvailableCount++;\r
\r
//\r
- //Copy BSSType and SSId\r
+ // Copy BSSType and SSId\r
//\r
- CopyMem(&Profile->Network, Network, sizeof (EFI_80211_NETWORK));\r
+ CopyMem (&Profile->Network, Network, sizeof (EFI_80211_NETWORK));\r
\r
//\r
- //Copy AKMSuite list\r
+ // Copy AKMSuite list\r
//\r
if (Network->AKMSuite != NULL) {\r
-\r
if (Network->AKMSuite->AKMSuiteCount == 0) {\r
DataSize = sizeof (EFI_80211_AKM_SUITE_SELECTOR);\r
} else {\r
DataSize = sizeof (EFI_80211_AKM_SUITE_SELECTOR) + sizeof (EFI_80211_SUITE_SELECTOR)\r
- * (Network->AKMSuite->AKMSuiteCount - 1);\r
+ * (Network->AKMSuite->AKMSuiteCount - 1);\r
}\r
- Profile->Network.AKMSuite = (EFI_80211_AKM_SUITE_SELECTOR *) AllocateZeroPool (DataSize);\r
+\r
+ Profile->Network.AKMSuite = (EFI_80211_AKM_SUITE_SELECTOR *)AllocateZeroPool (DataSize);\r
if (Profile->Network.AKMSuite == NULL) {\r
continue;\r
}\r
+\r
CopyMem (Profile->Network.AKMSuite, Network->AKMSuite, DataSize);\r
}\r
\r
//\r
- //Copy CipherSuite list\r
+ // Copy CipherSuite list\r
//\r
if (Network->CipherSuite != NULL) {\r
-\r
if (Network->CipherSuite->CipherSuiteCount == 0) {\r
DataSize = sizeof (EFI_80211_CIPHER_SUITE_SELECTOR);\r
} else {\r
DataSize = sizeof (EFI_80211_CIPHER_SUITE_SELECTOR) + sizeof (EFI_80211_SUITE_SELECTOR)\r
- * (Network->CipherSuite->CipherSuiteCount - 1);\r
+ * (Network->CipherSuite->CipherSuiteCount - 1);\r
}\r
- Profile->Network.CipherSuite = (EFI_80211_CIPHER_SUITE_SELECTOR *) AllocateZeroPool (DataSize);\r
+\r
+ Profile->Network.CipherSuite = (EFI_80211_CIPHER_SUITE_SELECTOR *)AllocateZeroPool (DataSize);\r
if (Profile->Network.CipherSuite == NULL) {\r
continue;\r
}\r
+\r
CopyMem (Profile->Network.CipherSuite, Network->CipherSuite, DataSize);\r
}\r
} else {\r
if (Profile->NetworkQuality < NetworkDescription->NetworkQuality) {\r
Profile->NetworkQuality = NetworkDescription->NetworkQuality;\r
}\r
+\r
continue;\r
}\r
}\r
// The current connected network should always be available until disconnection\r
// happens in Wifi FW layer, even when it is not in this time's scan result.\r
//\r
- if (Nic->ConnectState == WifiMgrConnectedToAp && Nic->CurrentOperateNetwork != NULL) {\r
+ if ((Nic->ConnectState == WifiMgrConnectedToAp) && (Nic->CurrentOperateNetwork != NULL)) {\r
if (!Nic->CurrentOperateNetwork->IsAvailable) {\r
Nic->CurrentOperateNetwork->IsAvailable = TRUE;\r
- Nic->AvailableCount ++;\r
+ Nic->AvailableCount++;\r
}\r
}\r
\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
WifiMgrStartScan (\r
- IN WIFI_MGR_DEVICE_DATA *Nic\r
+ IN WIFI_MGR_DEVICE_DATA *Nic\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
- EFI_80211_GET_NETWORKS_TOKEN *GetNetworksToken;\r
- UINT32 HiddenSSIdIndex;\r
- UINT32 HiddenSSIdCount;\r
- EFI_80211_SSID *HiddenSSIdList;\r
- WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
- LIST_ENTRY *Entry;\r
-\r
- if (Nic == NULL || Nic->Wmp == NULL) {\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ EFI_80211_GET_NETWORKS_TOKEN *GetNetworksToken;\r
+ UINT32 HiddenSSIdIndex;\r
+ UINT32 HiddenSSIdCount;\r
+ EFI_80211_SSID *HiddenSSIdList;\r
+ WIFI_HIDDEN_NETWORK_DATA *HiddenNetwork;\r
+ LIST_ENTRY *Entry;\r
+\r
+ if ((Nic == NULL) || (Nic->Wmp == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
HiddenSSIdIndex = 0;\r
\r
//\r
- //create a new get network token\r
+ // create a new get network token\r
//\r
- ConfigToken = AllocateZeroPool (sizeof (WIFI_MGR_MAC_CONFIG_TOKEN));\r
+ ConfigToken = AllocateZeroPool (sizeof (WIFI_MGR_MAC_CONFIG_TOKEN));\r
if (ConfigToken == NULL) {\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- ConfigToken->Type = TokenTypeGetNetworksToken;\r
- ConfigToken->Nic = Nic;\r
+ ConfigToken->Type = TokenTypeGetNetworksToken;\r
+ ConfigToken->Nic = Nic;\r
ConfigToken->Token.GetNetworksToken = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_TOKEN));\r
if (ConfigToken->Token.GetNetworksToken == NULL) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
GetNetworksToken = ConfigToken->Token.GetNetworksToken;\r
\r
//\r
// There are some hidden networks to scan, add them into scan list\r
//\r
if (HiddenSSIdCount > 0) {\r
- HiddenSSIdList = AllocateZeroPool(HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
+ HiddenSSIdList = AllocateZeroPool (HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
if (HiddenSSIdList == NULL) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
HiddenSSIdIndex = 0;\r
NET_LIST_FOR_EACH (Entry, &Nic->Private->HiddenNetworkList) {\r
-\r
- HiddenNetwork = NET_LIST_USER_STRUCT_S (Entry, WIFI_HIDDEN_NETWORK_DATA,\r
- Link, WIFI_MGR_HIDDEN_NETWORK_SIGNATURE);\r
- HiddenSSIdList[HiddenSSIdIndex].SSIdLen = (UINT8) StrLen (HiddenNetwork->SSId);\r
- UnicodeStrToAsciiStrS(HiddenNetwork->SSId,\r
- (CHAR8 *) HiddenSSIdList[HiddenSSIdIndex].SSId, SSID_STORAGE_SIZE);\r
- HiddenSSIdIndex ++;\r
+ HiddenNetwork = NET_LIST_USER_STRUCT_S (\r
+ Entry,\r
+ WIFI_HIDDEN_NETWORK_DATA,\r
+ Link,\r
+ WIFI_MGR_HIDDEN_NETWORK_SIGNATURE\r
+ );\r
+ HiddenSSIdList[HiddenSSIdIndex].SSIdLen = (UINT8)StrLen (HiddenNetwork->SSId);\r
+ UnicodeStrToAsciiStrS (\r
+ HiddenNetwork->SSId,\r
+ (CHAR8 *)HiddenSSIdList[HiddenSSIdIndex].SSId,\r
+ SSID_STORAGE_SIZE\r
+ );\r
+ HiddenSSIdIndex++;\r
}\r
- GetNetworksToken->Data = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_DATA) +\r
- (HiddenSSIdCount - 1) * sizeof (EFI_80211_SSID));\r
+ GetNetworksToken->Data = AllocateZeroPool (\r
+ sizeof (EFI_80211_GET_NETWORKS_DATA) +\r
+ (HiddenSSIdCount - 1) * sizeof (EFI_80211_SSID)\r
+ );\r
if (GetNetworksToken->Data == NULL) {\r
FreePool (HiddenSSIdList);\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
GetNetworksToken->Data->NumOfSSID = HiddenSSIdCount;\r
- CopyMem(GetNetworksToken->Data->SSIDList, HiddenSSIdList, HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
- FreePool(HiddenSSIdList);\r
+ CopyMem (GetNetworksToken->Data->SSIDList, HiddenSSIdList, HiddenSSIdCount * sizeof (EFI_80211_SSID));\r
+ FreePool (HiddenSSIdList);\r
} else {\r
-\r
GetNetworksToken->Data = AllocateZeroPool (sizeof (EFI_80211_GET_NETWORKS_DATA));\r
if (GetNetworksToken->Data == NULL) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
}\r
\r
//\r
- //Create a handle when scan process ends\r
+ // Create a handle when scan process ends\r
//\r
Status = gBS->CreateEvent (\r
EVT_NOTIFY_SIGNAL,\r
&GetNetworksToken->Event\r
);\r
if (EFI_ERROR (Status)) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
\r
//\r
- //Start scan ...\r
+ // Start scan ...\r
//\r
Status = Nic->Wmp->GetNetworks (Nic->Wmp, GetNetworksToken);\r
if (EFI_ERROR (Status)) {\r
- Nic->ScanState = WifiMgrScanFinished;\r
- WifiMgrFreeToken(ConfigToken);\r
+ Nic->ScanState = WifiMgrScanFinished;\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
**/\r
EFI_STATUS\r
WifiMgrConfigPassword (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_SUPPLICANT_PROTOCOL *Supplicant;\r
- EFI_80211_SSID SSId;\r
- UINT8 *AsciiPassword;\r
+ EFI_STATUS Status;\r
+ EFI_SUPPLICANT_PROTOCOL *Supplicant;\r
+ EFI_80211_SSID SSId;\r
+ UINT8 *AsciiPassword;\r
\r
- if (Nic == NULL || Nic->Supplicant == NULL || Profile == NULL) {\r
+ if ((Nic == NULL) || (Nic->Supplicant == NULL) || (Profile == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
Supplicant = Nic->Supplicant;\r
//\r
- //Set SSId to supplicant\r
+ // Set SSId to supplicant\r
//\r
SSId.SSIdLen = Profile->Network.SSId.SSIdLen;\r
- CopyMem(SSId.SSId, Profile->Network.SSId.SSId, sizeof (Profile->Network.SSId.SSId));\r
- Status = Supplicant->SetData(Supplicant,EfiSupplicant80211TargetSSIDName,\r
- (VOID *)&SSId, sizeof(EFI_80211_SSID));\r
- if (EFI_ERROR(Status)) {\r
+ CopyMem (SSId.SSId, Profile->Network.SSId.SSId, sizeof (Profile->Network.SSId.SSId));\r
+ Status = Supplicant->SetData (\r
+ Supplicant,\r
+ EfiSupplicant80211TargetSSIDName,\r
+ (VOID *)&SSId,\r
+ sizeof (EFI_80211_SSID)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
//\r
- //Set password to supplicant\r
+ // Set password to supplicant\r
//\r
if (StrLen (Profile->Password) < PASSWORD_MIN_LEN) {\r
return EFI_NOT_FOUND;\r
}\r
- AsciiPassword = AllocateZeroPool ((StrLen(Profile->Password) + 1) * sizeof (UINT8));\r
+\r
+ AsciiPassword = AllocateZeroPool ((StrLen (Profile->Password) + 1) * sizeof (UINT8));\r
if (AsciiPassword == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- UnicodeStrToAsciiStrS (Profile->Password, (CHAR8 *) AsciiPassword, PASSWORD_STORAGE_SIZE);\r
- Status = Supplicant->SetData (Supplicant, EfiSupplicant80211PskPassword,\r
- AsciiPassword, (StrLen(Profile->Password) + 1) * sizeof (UINT8));\r
- ZeroMem (AsciiPassword, AsciiStrLen ((CHAR8 *) AsciiPassword) + 1);\r
- FreePool(AsciiPassword);\r
+\r
+ UnicodeStrToAsciiStrS (Profile->Password, (CHAR8 *)AsciiPassword, PASSWORD_STORAGE_SIZE);\r
+ Status = Supplicant->SetData (\r
+ Supplicant,\r
+ EfiSupplicant80211PskPassword,\r
+ AsciiPassword,\r
+ (StrLen (Profile->Password) + 1) * sizeof (UINT8)\r
+ );\r
+ ZeroMem (AsciiPassword, AsciiStrLen ((CHAR8 *)AsciiPassword) + 1);\r
+ FreePool (AsciiPassword);\r
\r
return Status;\r
}\r
**/\r
EFI_STATUS\r
WifiMgrConfigEap (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_EAP_CONFIGURATION_PROTOCOL *EapConfig;\r
- EFI_EAP_TYPE EapAuthMethod;\r
- EFI_EAP_TYPE EapSecondAuthMethod;\r
- EFI_EAP_TYPE *AuthMethodList;\r
- CHAR8 *Identity;\r
- UINTN IdentitySize;\r
- CHAR16 *Password;\r
- UINTN PasswordSize;\r
- UINTN EncryptPasswordLen;\r
- CHAR8 *AsciiEncryptPassword;\r
- UINTN AuthMethodListSize;\r
- UINTN Index;\r
-\r
- if (Nic == NULL || Nic->EapConfig == NULL || Profile == NULL) {\r
+ EFI_STATUS Status;\r
+ EFI_EAP_CONFIGURATION_PROTOCOL *EapConfig;\r
+ EFI_EAP_TYPE EapAuthMethod;\r
+ EFI_EAP_TYPE EapSecondAuthMethod;\r
+ EFI_EAP_TYPE *AuthMethodList;\r
+ CHAR8 *Identity;\r
+ UINTN IdentitySize;\r
+ CHAR16 *Password;\r
+ UINTN PasswordSize;\r
+ UINTN EncryptPasswordLen;\r
+ CHAR8 *AsciiEncryptPassword;\r
+ UINTN AuthMethodListSize;\r
+ UINTN Index;\r
+\r
+ if ((Nic == NULL) || (Nic->EapConfig == NULL) || (Profile == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
EapConfig = Nic->EapConfig;\r
\r
if (Profile->EapAuthMethod >= EAP_AUTH_METHOD_MAX) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
EapAuthMethod = mEapAuthMethod[Profile->EapAuthMethod];\r
\r
if (EapAuthMethod != EFI_EAP_TYPE_EAPTLS) {\r
if (Profile->EapSecondAuthMethod >= EAP_SEAUTH_METHOD_MAX) {\r
return EFI_INVALID_PARAMETER;\r
}\r
+\r
EapSecondAuthMethod = mEapSecondAuthMethod[Profile->EapSecondAuthMethod];\r
}\r
\r
//\r
- //The first time to get Supported Auth Method list, return the size.\r
+ // The first time to get Supported Auth Method list, return the size.\r
//\r
- AuthMethodListSize = 0;\r
- AuthMethodList = NULL;\r
- Status = EapConfig->GetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapSupportedAuthMethod,\r
- (VOID *) AuthMethodList, &AuthMethodListSize);\r
+ AuthMethodListSize = 0;\r
+ AuthMethodList = NULL;\r
+ Status = EapConfig->GetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_ATTRIBUTE,\r
+ EfiEapConfigEapSupportedAuthMethod,\r
+ (VOID *)AuthMethodList,\r
+ &AuthMethodListSize\r
+ );\r
if (Status == EFI_SUCCESS) {\r
//\r
- //No Supported Eap Auth Method\r
+ // No Supported Eap Auth Method\r
//\r
return EFI_UNSUPPORTED;\r
} else if (Status != EFI_BUFFER_TOO_SMALL) {\r
// The second time to get Supported Auth Method list, return the list.\r
// In current design, only EAPTLS, TTLS and PEAP are supported\r
//\r
- AuthMethodList = (EFI_EAP_TYPE *) AllocateZeroPool(AuthMethodListSize);\r
+ AuthMethodList = (EFI_EAP_TYPE *)AllocateZeroPool (AuthMethodListSize);\r
if (AuthMethodList == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- Status = EapConfig->GetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapSupportedAuthMethod,\r
- (VOID *) AuthMethodList, &AuthMethodListSize);\r
+\r
+ Status = EapConfig->GetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_ATTRIBUTE,\r
+ EfiEapConfigEapSupportedAuthMethod,\r
+ (VOID *)AuthMethodList,\r
+ &AuthMethodListSize\r
+ );\r
if (EFI_ERROR (Status)) {\r
FreePool (AuthMethodList);\r
return Status;\r
}\r
\r
//\r
- //Check if EapAuthMethod is in supported Auth Method list, if found, skip the loop.\r
+ // Check if EapAuthMethod is in supported Auth Method list, if found, skip the loop.\r
//\r
- for (Index = 0; Index < AuthMethodListSize / sizeof (EFI_EAP_TYPE); Index ++) {\r
+ for (Index = 0; Index < AuthMethodListSize / sizeof (EFI_EAP_TYPE); Index++) {\r
if (EapAuthMethod == AuthMethodList[Index]) {\r
break;\r
}\r
}\r
+\r
if (Index == AuthMethodListSize / sizeof (EFI_EAP_TYPE)) {\r
FreePool (AuthMethodList);\r
return EFI_UNSUPPORTED;\r
}\r
+\r
FreePool (AuthMethodList);\r
\r
//\r
// Set Identity to Eap peer, Mandatory field for PEAP and TTLS\r
//\r
if (StrLen (Profile->EapIdentity) > 0) {\r
-\r
- IdentitySize = sizeof(CHAR8) * (StrLen(Profile->EapIdentity) + 1);\r
- Identity = AllocateZeroPool (IdentitySize);\r
+ IdentitySize = sizeof (CHAR8) * (StrLen (Profile->EapIdentity) + 1);\r
+ Identity = AllocateZeroPool (IdentitySize);\r
if (Identity == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- UnicodeStrToAsciiStrS(Profile->EapIdentity, Identity, IdentitySize);\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_IDENTITY, EfiEapConfigIdentityString,\r
- (VOID *) Identity, IdentitySize - 1);\r
- if (EFI_ERROR(Status)) {\r
+\r
+ UnicodeStrToAsciiStrS (Profile->EapIdentity, Identity, IdentitySize);\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_IDENTITY,\r
+ EfiEapConfigIdentityString,\r
+ (VOID *)Identity,\r
+ IdentitySize - 1\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
FreePool (Identity);\r
return Status;\r
}\r
+\r
FreePool (Identity);\r
} else {\r
if (EapAuthMethod != EFI_EAP_TYPE_EAPTLS) {\r
}\r
\r
//\r
- //Set Auth Method to Eap peer, Mandatory field\r
+ // Set Auth Method to Eap peer, Mandatory field\r
//\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_ATTRIBUTE, EfiEapConfigEapAuthMethod,\r
- (VOID *) &EapAuthMethod, sizeof (EapAuthMethod));\r
- if (EFI_ERROR(Status)) {\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_ATTRIBUTE,\r
+ EfiEapConfigEapAuthMethod,\r
+ (VOID *)&EapAuthMethod,\r
+ sizeof (EapAuthMethod)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
- if (EapAuthMethod == EFI_EAP_TYPE_TTLS || EapAuthMethod == EFI_EAP_TYPE_PEAP) {\r
-\r
- Status = EapConfig->SetData (EapConfig, EapAuthMethod, EfiEapConfigEap2ndAuthMethod,\r
- (VOID *) &EapSecondAuthMethod, sizeof (EapSecondAuthMethod));\r
- if (EFI_ERROR(Status)) {\r
+ if ((EapAuthMethod == EFI_EAP_TYPE_TTLS) || (EapAuthMethod == EFI_EAP_TYPE_PEAP)) {\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EapAuthMethod,\r
+ EfiEapConfigEap2ndAuthMethod,\r
+ (VOID *)&EapSecondAuthMethod,\r
+ sizeof (EapSecondAuthMethod)\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
// Set Password to Eap peer\r
//\r
if (StrLen (Profile->EapPassword) < PASSWORD_MIN_LEN) {\r
-\r
DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: No Eap Password for Network: %s.\n", Profile->SSId));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
PasswordSize = sizeof (CHAR16) * (StrLen (Profile->EapPassword) + 1);\r
- Password = AllocateZeroPool (PasswordSize);\r
+ Password = AllocateZeroPool (PasswordSize);\r
if (Password == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- StrCpyS (Password, PasswordSize, Profile->EapPassword);;\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_MSCHAPV2, EfiEapConfigEapMSChapV2Password,\r
- (VOID *) Password, PasswordSize);\r
+\r
+ StrCpyS (Password, PasswordSize, Profile->EapPassword);\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_MSCHAPV2,\r
+ EfiEapConfigEapMSChapV2Password,\r
+ (VOID *)Password,\r
+ PasswordSize\r
+ );\r
ZeroMem (Password, PasswordSize);\r
FreePool (Password);\r
if (EFI_ERROR (Status)) {\r
}\r
\r
//\r
- //If CA cert is required, set it to Eap peer\r
+ // If CA cert is required, set it to Eap peer\r
//\r
if (Profile->CACertData != NULL) {\r
-\r
- Status = EapConfig->SetData (EapConfig, EapAuthMethod, EfiEapConfigEapTlsCACert,\r
- Profile->CACertData, Profile->CACertSize);\r
- if (EFI_ERROR(Status)) {\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EapAuthMethod,\r
+ EfiEapConfigEapTlsCACert,\r
+ Profile->CACertData,\r
+ Profile->CACertSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
} else {\r
return EFI_INVALID_PARAMETER;\r
}\r
} else if (EapAuthMethod == EFI_EAP_TYPE_EAPTLS) {\r
-\r
//\r
- //Set CA cert to Eap peer\r
+ // Set CA cert to Eap peer\r
//\r
if (Profile->CACertData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsCACert,\r
- Profile->CACertData, Profile->CACertSize);\r
- if (EFI_ERROR(Status)) {\r
+\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_EAPTLS,\r
+ EfiEapConfigEapTlsCACert,\r
+ Profile->CACertData,\r
+ Profile->CACertSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
//\r
- //Set Client cert to Eap peer\r
+ // Set Client cert to Eap peer\r
//\r
if (Profile->ClientCertData == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsClientCert,\r
- Profile->ClientCertData, Profile->ClientCertSize);\r
- if (EFI_ERROR(Status)) {\r
+\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_EAPTLS,\r
+ EfiEapConfigEapTlsClientCert,\r
+ Profile->ClientCertData,\r
+ Profile->ClientCertSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
//\r
- //Set Private key to Eap peer\r
+ // Set Private key to Eap peer\r
//\r
if (Profile->PrivateKeyData == NULL) {\r
-\r
DEBUG ((DEBUG_ERROR, "[WiFi Connection Manager] Error: No Private Key for Network: %s.\n", Profile->SSId));\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Status = EapConfig->SetData (EapConfig, EFI_EAP_TYPE_EAPTLS, EfiEapConfigEapTlsClientPrivateKeyFile,\r
- Profile->PrivateKeyData, Profile->PrivateKeyDataSize);\r
- if (EFI_ERROR(Status)) {\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_EAPTLS,\r
+ EfiEapConfigEapTlsClientPrivateKeyFile,\r
+ Profile->PrivateKeyData,\r
+ Profile->PrivateKeyDataSize\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
if (StrLen (Profile->PrivateKeyPassword) > 0) {\r
-\r
- EncryptPasswordLen = StrLen (Profile->PrivateKeyPassword);\r
- AsciiEncryptPassword = AllocateZeroPool(EncryptPasswordLen + 1);\r
+ EncryptPasswordLen = StrLen (Profile->PrivateKeyPassword);\r
+ AsciiEncryptPassword = AllocateZeroPool (EncryptPasswordLen + 1);\r
if (AsciiEncryptPassword == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
- UnicodeStrToAsciiStrS(Profile->PrivateKeyPassword, AsciiEncryptPassword, EncryptPasswordLen + 1);\r
- Status = EapConfig->SetData(EapConfig, EFI_EAP_TYPE_EAPTLS,\r
- EfiEapConfigEapTlsClientPrivateKeyFilePassword,\r
- (VOID *) AsciiEncryptPassword, EncryptPasswordLen + 1);\r
- if (EFI_ERROR(Status)) {\r
\r
+ UnicodeStrToAsciiStrS (Profile->PrivateKeyPassword, AsciiEncryptPassword, EncryptPasswordLen + 1);\r
+ Status = EapConfig->SetData (\r
+ EapConfig,\r
+ EFI_EAP_TYPE_EAPTLS,\r
+ EfiEapConfigEapTlsClientPrivateKeyFilePassword,\r
+ (VOID *)AsciiEncryptPassword,\r
+ EncryptPasswordLen + 1\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
ZeroMem (AsciiEncryptPassword, EncryptPasswordLen + 1);\r
FreePool (AsciiEncryptPassword);\r
return Status;\r
**/\r
EFI_STATUS\r
WifiMgrGetLinkState (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- OUT EFI_ADAPTER_INFO_MEDIA_STATE *LinkState\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ OUT EFI_ADAPTER_INFO_MEDIA_STATE *LinkState\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- UINTN DataSize;\r
- EFI_ADAPTER_INFO_MEDIA_STATE *UndiState;\r
- EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ UINTN DataSize;\r
+ EFI_ADAPTER_INFO_MEDIA_STATE *UndiState;\r
+ EFI_ADAPTER_INFORMATION_PROTOCOL *Aip;\r
\r
- if (Nic == NULL || LinkState == NULL) {\r
+ if ((Nic == NULL) || (LinkState == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
Status = gBS->OpenProtocol (\r
Nic->ControllerHandle,\r
&gEfiAdapterInformationProtocolGuid,\r
- (VOID**) &Aip,\r
+ (VOID **)&Aip,\r
Nic->DriverHandle,\r
Nic->ControllerHandle,\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
return EFI_UNSUPPORTED;\r
}\r
\r
- Status = Aip->GetInformation(\r
+ Status = Aip->GetInformation (\r
Aip,\r
&gEfiAdapterInfoMediaStateGuid,\r
- (VOID **) &UndiState,\r
+ (VOID **)&UndiState,\r
&DataSize\r
);\r
if (EFI_ERROR (Status)) {\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
+\r
gBS->RestoreTPL (OldTpl);\r
\r
CopyMem (LinkState, UndiState, sizeof (EFI_ADAPTER_INFO_MEDIA_STATE));\r
**/\r
EFI_STATUS\r
WifiMgrPrepareConnection (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
)\r
{\r
- EFI_STATUS Status;\r
- UINT8 SecurityType;\r
- BOOLEAN AKMSuiteSupported;\r
- BOOLEAN CipherSuiteSupported;\r
+ EFI_STATUS Status;\r
+ UINT8 SecurityType;\r
+ BOOLEAN AKMSuiteSupported;\r
+ BOOLEAN CipherSuiteSupported;\r
\r
- if (Profile == NULL || Nic == NULL) {\r
+ if ((Profile == NULL) || (Nic == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- Status = WifiMgrCheckRSN (Profile->Network.AKMSuite, Profile->Network.CipherSuite,\r
- Nic, &SecurityType, &AKMSuiteSupported, &CipherSuiteSupported);\r
+ Status = WifiMgrCheckRSN (\r
+ Profile->Network.AKMSuite,\r
+ Profile->Network.CipherSuite,\r
+ Nic,\r
+ &SecurityType,\r
+ &AKMSuiteSupported,\r
+ &CipherSuiteSupported\r
+ );\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
WifiMgrUpdateConnectMessage (Nic, FALSE, L"Connect Failed: Invalid Password!");\r
}\r
}\r
+\r
return Status;\r
}\r
+\r
break;\r
\r
case SECURITY_TYPE_WPA2_ENTERPRISE:\r
WifiMgrUpdateConnectMessage (Nic, FALSE, L"Connect Failed: Invalid Configuration!");\r
}\r
}\r
+\r
return Status;\r
}\r
+\r
break;\r
\r
case SECURITY_TYPE_NONE:\r
VOID\r
EFIAPI\r
WifiMgrOnConnectFinished (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- EFI_STATUS Status;\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
- WIFI_MGR_NETWORK_PROFILE *ConnectedProfile;\r
- UINT8 SecurityType;\r
- UINT8 SSIdLen;\r
- CHAR8 *AsciiSSId;\r
+ EFI_STATUS Status;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ WIFI_MGR_NETWORK_PROFILE *ConnectedProfile;\r
+ UINT8 SecurityType;\r
+ UINT8 SSIdLen;\r
+ CHAR8 *AsciiSSId;\r
\r
ASSERT (Context != NULL);\r
\r
ConnectedProfile = NULL;\r
- ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN*) Context;\r
+ ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
ASSERT (ConfigToken->Nic != NULL);\r
\r
ConfigToken->Nic->ConnectState = WifiMgrDisconnected;\r
\r
ASSERT (ConfigToken->Token.ConnectNetworkToken != NULL);\r
if (ConfigToken->Token.ConnectNetworkToken->Status != EFI_SUCCESS) {\r
-\r
if (ConfigToken->Nic->OneTimeConnectRequest) {\r
//\r
// Only update message for user triggered connection\r
//\r
if (ConfigToken->Token.ConnectNetworkToken->Status == EFI_ACCESS_DENIED) {\r
-\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed: Permission Denied!");\r
} else {\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed!");\r
}\r
+\r
ConfigToken->Nic->OneTimeConnectRequest = FALSE;\r
}\r
+\r
ConfigToken->Nic->CurrentOperateNetwork = NULL;\r
return;\r
}\r
\r
if (ConfigToken->Token.ConnectNetworkToken->ResultCode != ConnectSuccess) {\r
-\r
if (ConfigToken->Nic->OneTimeConnectRequest) {\r
-\r
if (ConfigToken->Token.ConnectNetworkToken->ResultCode == ConnectFailedReasonUnspecified) {\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed: Wrong Password or Unexpected Error!");\r
} else {\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Connect Failed!");\r
}\r
}\r
+\r
goto Exit;\r
}\r
\r
- if (ConfigToken->Token.ConnectNetworkToken->Data == NULL ||\r
- ConfigToken->Token.ConnectNetworkToken->Data->Network == NULL) {\r
-\r
+ if ((ConfigToken->Token.ConnectNetworkToken->Data == NULL) ||\r
+ (ConfigToken->Token.ConnectNetworkToken->Data->Network == NULL))\r
+ {\r
//\r
// An unexpected error occurs, tell low layer to perform a disconnect\r
//\r
//\r
// A correct connect token received, terminate the connection process\r
//\r
- Status = WifiMgrCheckRSN(ConfigToken->Token.ConnectNetworkToken->Data->Network->AKMSuite,\r
+ Status = WifiMgrCheckRSN (\r
+ ConfigToken->Token.ConnectNetworkToken->Data->Network->AKMSuite,\r
ConfigToken->Token.ConnectNetworkToken->Data->Network->CipherSuite,\r
- ConfigToken->Nic, &SecurityType, NULL, NULL);\r
- if (EFI_ERROR(Status)) {\r
+ ConfigToken->Nic,\r
+ &SecurityType,\r
+ NULL,\r
+ NULL\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
SecurityType = SECURITY_TYPE_UNKNOWN;\r
}\r
\r
SSIdLen = ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSIdLen;\r
- AsciiSSId = (CHAR8*) AllocateZeroPool(sizeof (CHAR8) * (SSIdLen + 1));\r
+ AsciiSSId = (CHAR8 *)AllocateZeroPool (sizeof (CHAR8) * (SSIdLen + 1));\r
if (AsciiSSId == NULL) {\r
ConfigToken->Nic->HasDisconnectPendingNetwork = TRUE;\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
goto Exit;\r
}\r
\r
- CopyMem(AsciiSSId, ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSId, SSIdLen);\r
+ CopyMem (AsciiSSId, ConfigToken->Token.ConnectNetworkToken->Data->Network->SSId.SSId, SSIdLen);\r
*(AsciiSSId + SSIdLen) = '\0';\r
\r
- ConnectedProfile = WifiMgrGetProfileByAsciiSSId(AsciiSSId, SecurityType, &ConfigToken->Nic->ProfileList);\r
- FreePool(AsciiSSId);\r
+ ConnectedProfile = WifiMgrGetProfileByAsciiSSId (AsciiSSId, SecurityType, &ConfigToken->Nic->ProfileList);\r
+ FreePool (AsciiSSId);\r
if (ConnectedProfile == NULL) {\r
ConfigToken->Nic->HasDisconnectPendingNetwork = TRUE;\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
if (ConfigToken->Nic->ConnectState == WifiMgrDisconnected) {\r
ConfigToken->Nic->CurrentOperateNetwork = NULL;\r
}\r
+\r
ConfigToken->Nic->OneTimeConnectRequest = FALSE;\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
WifiMgrConnectToNetwork (\r
- IN WIFI_MGR_DEVICE_DATA *Nic,\r
- IN WIFI_MGR_NETWORK_PROFILE *Profile\r
+ IN WIFI_MGR_DEVICE_DATA *Nic,\r
+ IN WIFI_MGR_NETWORK_PROFILE *Profile\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- EFI_ADAPTER_INFO_MEDIA_STATE LinkState;\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
- EFI_80211_CONNECT_NETWORK_TOKEN *ConnectToken;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ EFI_ADAPTER_INFO_MEDIA_STATE LinkState;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ EFI_80211_CONNECT_NETWORK_TOKEN *ConnectToken;\r
\r
- if (Nic == NULL || Nic->Wmp == NULL || Profile == NULL) {\r
+ if ((Nic == NULL) || (Nic->Wmp == NULL) || (Profile == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
+\r
if (LinkState.MediaState == EFI_SUCCESS) {\r
return EFI_ALREADY_STARTED;\r
}\r
goto Exit;\r
}\r
\r
- ConfigToken->Type = TokenTypeConnectNetworkToken;\r
- ConfigToken->Nic = Nic;\r
- ConfigToken->Token.ConnectNetworkToken = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_TOKEN));\r
+ ConfigToken->Type = TokenTypeConnectNetworkToken;\r
+ ConfigToken->Nic = Nic;\r
+ ConfigToken->Token.ConnectNetworkToken = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_TOKEN));\r
if (ConfigToken->Token.ConnectNetworkToken == NULL) {\r
goto Exit;\r
}\r
\r
- ConnectToken = ConfigToken->Token.ConnectNetworkToken;\r
- ConnectToken->Data = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_DATA));\r
+ ConnectToken = ConfigToken->Token.ConnectNetworkToken;\r
+ ConnectToken->Data = AllocateZeroPool (sizeof (EFI_80211_CONNECT_NETWORK_DATA));\r
if (ConnectToken->Data == NULL) {\r
goto Exit;\r
}\r
if (ConnectToken->Data->Network == NULL) {\r
goto Exit;\r
}\r
- CopyMem(ConnectToken->Data->Network, &Profile->Network, sizeof (EFI_80211_NETWORK));\r
+\r
+ CopyMem (ConnectToken->Data->Network, &Profile->Network, sizeof (EFI_80211_NETWORK));\r
\r
//\r
// Add event handle and start to connect\r
goto Exit;\r
}\r
\r
- Nic->ConnectState = WifiMgrConnectingToAp;\r
+ Nic->ConnectState = WifiMgrConnectingToAp;\r
Nic->CurrentOperateNetwork = Profile;\r
WifiMgrUpdateConnectMessage (Nic, FALSE, NULL);\r
\r
//\r
- //Start Connecting ...\r
+ // Start Connecting ...\r
//\r
Status = Nic->Wmp->ConnectNetwork (Nic->Wmp, ConnectToken);\r
\r
Nic->ConnectState = WifiMgrConnectedToAp;\r
WifiMgrUpdateConnectMessage (Nic, TRUE, NULL);\r
} else {\r
-\r
Nic->ConnectState = WifiMgrDisconnected;\r
Nic->CurrentOperateNetwork = NULL;\r
\r
}\r
}\r
}\r
+\r
goto Exit;\r
}\r
\r
if (EFI_ERROR (Status)) {\r
WifiMgrFreeToken (ConfigToken);\r
}\r
+\r
gBS->RestoreTPL (OldTpl);\r
\r
DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] WifiMgrConnectToNetwork: %r\n", Status));\r
VOID\r
EFIAPI\r
WifiMgrOnDisconnectFinished (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
\r
ASSERT (Context != NULL);\r
\r
- ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN*) Context;\r
+ ConfigToken = (WIFI_MGR_MAC_CONFIG_TOKEN *)Context;\r
ASSERT (ConfigToken->Nic != NULL);\r
ASSERT (ConfigToken->Type == TokenTypeDisconnectNetworkToken);\r
\r
ASSERT (ConfigToken->Token.DisconnectNetworkToken != NULL);\r
if (ConfigToken->Token.DisconnectNetworkToken->Status != EFI_SUCCESS) {\r
- ConfigToken->Nic->ConnectState = WifiMgrConnectedToAp;\r
+ ConfigToken->Nic->ConnectState = WifiMgrConnectedToAp;\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
ConfigToken->Nic->OneTimeDisconnectRequest = FALSE;\r
goto Exit;\r
//\r
// Disconnected network may not be in network list now, trigger a scan again!\r
//\r
- ConfigToken->Nic->OneTimeScanRequest = TRUE;\r
+ ConfigToken->Nic->OneTimeScanRequest = TRUE;\r
\r
- Exit:\r
- WifiMgrFreeToken(ConfigToken);\r
- return;\r
+Exit:\r
+ WifiMgrFreeToken (ConfigToken);\r
+ return;\r
}\r
\r
/**\r
**/\r
EFI_STATUS\r
WifiMgrDisconnectToNetwork (\r
- IN WIFI_MGR_DEVICE_DATA *Nic\r
+ IN WIFI_MGR_DEVICE_DATA *Nic\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_TPL OldTpl;\r
- WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
- EFI_80211_DISCONNECT_NETWORK_TOKEN *DisconnectToken;\r
+ EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
+ WIFI_MGR_MAC_CONFIG_TOKEN *ConfigToken;\r
+ EFI_80211_DISCONNECT_NETWORK_TOKEN *DisconnectToken;\r
\r
if (Nic == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- ConfigToken->Type = TokenTypeDisconnectNetworkToken;\r
- ConfigToken->Nic = Nic;\r
+ ConfigToken->Type = TokenTypeDisconnectNetworkToken;\r
+ ConfigToken->Nic = Nic;\r
ConfigToken->Token.DisconnectNetworkToken = AllocateZeroPool (sizeof (EFI_80211_DISCONNECT_NETWORK_TOKEN));\r
if (ConfigToken->Token.DisconnectNetworkToken == NULL) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
&DisconnectToken->Event\r
);\r
if (EFI_ERROR (Status)) {\r
- WifiMgrFreeToken(ConfigToken);\r
+ WifiMgrFreeToken (ConfigToken);\r
gBS->RestoreTPL (OldTpl);\r
return Status;\r
}\r
Status = Nic->Wmp->DisconnectNetwork (Nic->Wmp, DisconnectToken);\r
if (EFI_ERROR (Status)) {\r
if (Status == EFI_NOT_FOUND) {\r
-\r
Nic->ConnectState = WifiMgrDisconnected;\r
Nic->CurrentOperateNetwork = NULL;\r
\r
//\r
// This network is not in network list now, trigger a scan again!\r
//\r
- Nic->OneTimeScanRequest = TRUE;\r
+ Nic->OneTimeScanRequest = TRUE;\r
\r
//\r
// State has been changed from Connected to Disconnected\r
//\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, TRUE, NULL);\r
- Status = EFI_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
} else {\r
if (Nic->OneTimeDisconnectRequest) {\r
-\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, L"Disconnect Failed: Unexpected Error!");\r
}\r
\r
- Nic->ConnectState = WifiMgrConnectedToAp;\r
+ Nic->ConnectState = WifiMgrConnectedToAp;\r
WifiMgrUpdateConnectMessage (ConfigToken->Nic, FALSE, NULL);\r
}\r
- WifiMgrFreeToken(ConfigToken);\r
+\r
+ WifiMgrFreeToken (ConfigToken);\r
}\r
\r
gBS->RestoreTPL (OldTpl);\r
VOID\r
EFIAPI\r
WifiMgrOnTimerTick (\r
- IN EFI_EVENT Event,\r
- IN VOID *Context\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
)\r
{\r
- WIFI_MGR_DEVICE_DATA *Nic;\r
- EFI_STATUS Status;\r
- EFI_ADAPTER_INFO_MEDIA_STATE LinkState;\r
- WIFI_MGR_NETWORK_PROFILE *Profile;\r
+ WIFI_MGR_DEVICE_DATA *Nic;\r
+ EFI_STATUS Status;\r
+ EFI_ADAPTER_INFO_MEDIA_STATE LinkState;\r
+ WIFI_MGR_NETWORK_PROFILE *Profile;\r
\r
if (Context == NULL) {\r
return;\r
}\r
\r
- Nic = (WIFI_MGR_DEVICE_DATA*) Context;\r
+ Nic = (WIFI_MGR_DEVICE_DATA *)Context;\r
NET_CHECK_SIGNATURE (Nic, WIFI_MGR_DEVICE_DATA_SIGNATURE);\r
\r
Status = WifiMgrGetLinkState (Nic, &LinkState);\r
}\r
\r
if (Nic->LastLinkState.MediaState != LinkState.MediaState) {\r
- if (Nic->LastLinkState.MediaState == EFI_SUCCESS && LinkState.MediaState == EFI_NO_MEDIA) {\r
+ if ((Nic->LastLinkState.MediaState == EFI_SUCCESS) && (LinkState.MediaState == EFI_NO_MEDIA)) {\r
Nic->HasDisconnectPendingNetwork = TRUE;\r
}\r
+\r
Nic->LastLinkState.MediaState = LinkState.MediaState;\r
}\r
\r
- Nic->ScanTickTime ++;\r
- if ((Nic->ScanTickTime > WIFI_SCAN_FREQUENCY || Nic->OneTimeScanRequest) &&\r
- Nic->ScanState == WifiMgrScanFinished) {\r
-\r
+ Nic->ScanTickTime++;\r
+ if (((Nic->ScanTickTime > WIFI_SCAN_FREQUENCY) || Nic->OneTimeScanRequest) &&\r
+ (Nic->ScanState == WifiMgrScanFinished))\r
+ {\r
Nic->OneTimeScanRequest = FALSE;\r
- Nic->ScanTickTime = 0;\r
+ Nic->ScanTickTime = 0;\r
\r
DEBUG ((DEBUG_INFO, "[WiFi Connection Manager] Scan is triggered.\n"));\r
WifiMgrStartScan (Nic);\r
}\r
\r
- if (Nic->AvailableCount > 0 && Nic->ScanState == WifiMgrScanFinished) {\r
-\r
+ if ((Nic->AvailableCount > 0) && (Nic->ScanState == WifiMgrScanFinished)) {\r
switch (Nic->ConnectState) {\r
- case WifiMgrDisconnected:\r
+ case WifiMgrDisconnected:\r
\r
- if (Nic->HasDisconnectPendingNetwork) {\r
- Nic->HasDisconnectPendingNetwork = FALSE;\r
- }\r
-\r
- if (Nic->ConnectPendingNetwork != NULL) {\r
+ if (Nic->HasDisconnectPendingNetwork) {\r
+ Nic->HasDisconnectPendingNetwork = FALSE;\r
+ }\r
\r
- Profile = Nic->ConnectPendingNetwork;\r
- Status = WifiMgrConnectToNetwork(Nic, Profile);\r
- Nic->ConnectPendingNetwork = NULL;\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Some error happened, don't wait for a return connect token!\r
- //\r
- Nic->OneTimeConnectRequest = FALSE;\r
+ if (Nic->ConnectPendingNetwork != NULL) {\r
+ Profile = Nic->ConnectPendingNetwork;\r
+ Status = WifiMgrConnectToNetwork (Nic, Profile);\r
+ Nic->ConnectPendingNetwork = NULL;\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Some error happened, don't wait for a return connect token!\r
+ //\r
+ Nic->OneTimeConnectRequest = FALSE;\r
+ }\r
}\r
- }\r
- break;\r
\r
- case WifiMgrConnectingToAp:\r
- break;\r
+ break;\r
\r
- case WifiMgrDisconnectingToAp:\r
- break;\r
+ case WifiMgrConnectingToAp:\r
+ break;\r
\r
- case WifiMgrConnectedToAp:\r
+ case WifiMgrDisconnectingToAp:\r
+ break;\r
\r
- if (Nic->ConnectPendingNetwork != NULL || Nic->HasDisconnectPendingNetwork) {\r
+ case WifiMgrConnectedToAp:\r
\r
- Status = WifiMgrDisconnectToNetwork(Nic);\r
- if (EFI_ERROR (Status)) {\r
- //\r
- // Some error happened, don't wait for a return disconnect token!\r
- //\r
- Nic->OneTimeDisconnectRequest = FALSE;\r
+ if ((Nic->ConnectPendingNetwork != NULL) || Nic->HasDisconnectPendingNetwork) {\r
+ Status = WifiMgrDisconnectToNetwork (Nic);\r
+ if (EFI_ERROR (Status)) {\r
+ //\r
+ // Some error happened, don't wait for a return disconnect token!\r
+ //\r
+ Nic->OneTimeDisconnectRequest = FALSE;\r
+ }\r
}\r
- }\r
- break;\r
\r
- default:\r
- break;\r
+ break;\r
+\r
+ default:\r
+ break;\r
}\r
}\r
}\r
projects / mirror_edk2.git / blobdiff