Index: components/wifi/wifi_service_mac.mm |
diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm |
index 65414371277ce19900fe014def4681b8e45b8d44..880c77b822fe5306282904bb0da944a6e5bbb20e 100644 |
--- a/components/wifi/wifi_service_mac.mm |
+++ b/components/wifi/wifi_service_mac.mm |
@@ -100,6 +100,9 @@ class WiFiServiceMac : public WiFiService { |
// Converts |CWSecurityMode| into onc::wifi::k{WPA|WEP}* security constant. |
std::string SecurityFromCWSecurityMode(CWSecurityMode security) const; |
+ // Converts |CWSecurity| into onc::wifi::k{WPA|WEP}* security constant. |
mef
2014/09/04 15:31:34
Nit: Either change this function to take |CWSecuri
Jiang Jiang
2014/09/04 16:04:21
Done.
|
+ std::string SecurityFromCWNetwork(const CWNetwork* network) const; |
+ |
// Converts |CWChannelBand| into Frequency constant. |
Frequency FrequencyFromCWChannelBand(CWChannelBand band) const; |
@@ -401,7 +404,7 @@ void WiFiServiceMac::SetEventObservers( |
}; |
wlan_observer_ = [[NSNotificationCenter defaultCenter] |
- addObserverForName:kCWSSIDDidChangeNotification |
+ addObserverForName:CWSSIDDidChangeNotification |
mef
2014/09/04 15:31:34
does it compile on 10.6?
Jiang Jiang
2014/09/04 16:04:21
Yes, according to the docs it's declared in 10.6 S
|
object:nil |
queue:nil |
usingBlock:ns_observer]; |
@@ -505,10 +508,18 @@ void WiFiServiceMac::NetworkPropertiesFromCWNetwork( |
properties->frequency = FrequencyFromCWChannelBand( |
static_cast<CWChannelBand>([[network wlanChannel] channelBand])); |
properties->frequency_set.insert(properties->frequency); |
- properties->security = SecurityFromCWSecurityMode( |
- static_cast<CWSecurityMode>([[network securityMode] intValue])); |
- properties->signal_strength = [[network rssi] intValue]; |
+ if ([network respondsToSelector:@selector(supportsSecurity:)]) { |
+ properties->security = SecurityFromCWNetwork(network); |
+ } else { |
+ properties->security = SecurityFromCWSecurityMode( |
+ static_cast<CWSecurityMode>([[network securityMode] intValue])); |
+ } |
+ |
+ if ([network respondsToSelector:@selector(rssiValue:)]) |
+ properties->signal_strength = [network rssiValue]; |
+ else |
+ properties->signal_strength = [[network rssi] intValue]; |
} |
std::string WiFiServiceMac::SecurityFromCWSecurityMode( |
@@ -532,6 +543,31 @@ std::string WiFiServiceMac::SecurityFromCWSecurityMode( |
return onc::wifi::kWPA_EAP; |
} |
+std::string WiFiServiceMac::SecurityFromCWNetwork( |
+ const CWNetwork* network) const { |
+ if ([network supportsSecurity:kCWSecurityWPAEnterprise] || |
+ [network supportsSecurity:kCWSecurityWPA2Enterprise]) { |
+ return onc::wifi::kWPA_EAP; |
+ } |
+ |
+ if ([network supportsSecurity:kCWSecurityWPAPersonal] || |
+ [network supportsSecurity:kCWSecurityWPA2Personal]) { |
+ return onc::wifi::kWPA_PSK; |
+ } |
+ |
+ if ([network supportsSecurity:kCWSecurityWEP]) |
+ return onc::wifi::kWEP_PSK; |
+ |
+ if ([network supportsSecurity:kCWSecurityNone]) |
+ return onc::wifi::kSecurityNone; |
+ |
+ // TODO(mef): Figure out correct mapping. |
+ if ([network supportsSecurity:kCWSecurityDynamicWEP]) |
+ return onc::wifi::kWPA_EAP; |
+ |
+ return onc::wifi::kWPA_EAP; |
+} |
+ |
Frequency WiFiServiceMac::FrequencyFromCWChannelBand(CWChannelBand band) const { |
return band == kCWChannelBand2GHz ? kFrequency2400 : kFrequency5000; |
} |