ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nexus: Validate that priority and KeyManagement are set before enabling a network

Browse source 
Signed-off-by: San Mehat <san@google.com>
This commit is contained in:
San Mehat 2009-06-01 10:04:21 -07:00
parent 78828ff4f5
commit 21e90f0e10
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nexus/WifiNetwork.cpp
View file

@ -551,6 +551,20 @@ int WifiNetwork::setAllowedGroupCiphers(uint32_t mask) {
} }
int WifiNetwork::setEnabled(bool enabled) { int WifiNetwork::setEnabled(bool enabled) {
if (enabled) {
if (getPriority() == -1) {
LOGE("Cannot enable network when priority is not set");
errno = EAGAIN;
return -1;
}
if (getAllowedKeyManagement() == KeyManagementMask::UNKNOWN) {
LOGE("Cannot enable network when KeyManagement is not set");
errno = EAGAIN;
return -1;
}
}
if (mSuppl->enableNetwork(mNetid, enabled)) if (mSuppl->enableNetwork(mNetid, enabled))
return -1; return -1;

9
nexus/WifiNetwork.h
View file

@ -23,10 +23,11 @@
class KeyManagementMask { class KeyManagementMask {
public: public:
static const uint32_t NONE = 0; static const uint32_t UNKNOWN = 0;
static const uint32_t WPA_PSK = 0x01; static const uint32_t NONE = 0x01;
static const uint32_t WPA_EAP = 0x02; static const uint32_t WPA_PSK = 0x02;
static const uint32_t IEEE8021X = 0x04; static const uint32_t WPA_EAP = 0x04;
static const uint32_t IEEE8021X = 0x08;
static const uint32_t ALL = WPA_PSK | WPA_EAP | IEEE8021X; static const uint32_t ALL = WPA_PSK | WPA_EAP | IEEE8021X;
}; };