Commit 34f59cac authored by Matthew Wang's avatar Matthew Wang Committed by Commit Bot

ONC: Add FTEnabled property to WiFi

Support FTEnabled property in ONC.

BUG=791202
TEST=chromeos_unittests
TEST=chrome.networkingPrivate.createNetwork with "FTEnabled":true
enables the device to connect to an FT network. Setting
"FTEnabled":false disables the device from connecting to an FT
network.

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2470753fd139505704987e301b18983dc51c5c47
Reviewed-on: https://chromium-review.googlesource.com/982275Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Matthew Wang <matthewmwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#549366}
parent 31bb680f
...@@ -225,6 +225,7 @@ const OncFieldSignature wifi_fields[] = { ...@@ -225,6 +225,7 @@ const OncFieldSignature wifi_fields[] = {
{::onc::wifi::kAllowGatewayARPPolling, &kBoolSignature}, {::onc::wifi::kAllowGatewayARPPolling, &kBoolSignature},
{::onc::wifi::kAutoConnect, &kBoolSignature}, {::onc::wifi::kAutoConnect, &kBoolSignature},
{::onc::wifi::kEAP, &kEAPSignature}, {::onc::wifi::kEAP, &kEAPSignature},
{::onc::wifi::kFTEnabled, &kBoolSignature},
{::onc::wifi::kHexSSID, &kStringSignature}, {::onc::wifi::kHexSSID, &kStringSignature},
{::onc::wifi::kHiddenSSID, &kBoolSignature}, {::onc::wifi::kHiddenSSID, &kBoolSignature},
{::onc::wifi::kPassphrase, &kStringSignature}, {::onc::wifi::kPassphrase, &kStringSignature},
......
...@@ -140,6 +140,7 @@ const FieldTranslationEntry wifi_fields[] = { ...@@ -140,6 +140,7 @@ const FieldTranslationEntry wifi_fields[] = {
// { ::onc::wifi::kEAP, shill::kEap*}, // { ::onc::wifi::kEAP, shill::kEap*},
{::onc::wifi::kFrequency, shill::kWifiFrequency}, {::onc::wifi::kFrequency, shill::kWifiFrequency},
{::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty}, {::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty},
{::onc::wifi::kFTEnabled, shill::kWifiFTEnabled},
{::onc::wifi::kHexSSID, shill::kWifiHexSsid}, {::onc::wifi::kHexSSID, shill::kWifiHexSsid},
{::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid}, {::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
{::onc::wifi::kPassphrase, shill::kPassphraseProperty}, {::onc::wifi::kPassphrase, shill::kPassphraseProperty},
......
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
"Mode": "managed", "Mode": "managed",
"SaveCredentials": true, "SaveCredentials": true,
"SecurityClass": "802_1x", "SecurityClass": "802_1x",
"Type": "wifi" "Type": "wifi",
"WiFi.FTEnabled": true
} }
...@@ -10,5 +10,6 @@ ...@@ -10,5 +10,6 @@
"WiFi.HiddenSSID": false, "WiFi.HiddenSSID": false,
"WiFi.Frequency": 2412, "WiFi.Frequency": 2412,
"WiFi.FrequencyList": [2412, 5180], "WiFi.FrequencyList": [2412, 5180],
"WiFi.FTEnabled": true,
"WiFi.RoamThreshold": 20 "WiFi.RoamThreshold": 20
} }
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"Name": "", "Name": "",
"WiFi": { "WiFi": {
"Security": "WPA-EAP", "Security": "WPA-EAP",
"FTEnabled": true,
"EAP": { "EAP": {
"ClientCertType": "PKCS11Id", "ClientCertType": "PKCS11Id",
"ClientCertPKCS11Id": "1:123456abcdef", "ClientCertPKCS11Id": "1:123456abcdef",
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"AutoConnect": true, "AutoConnect": true,
"Frequency": 2412, "Frequency": 2412,
"FrequencyList": [2412, 5180], "FrequencyList": [2412, 5180],
"FTEnabled": true,
"HexSSID": "4F70656E577274", // "OpenWrt" "HexSSID": "4F70656E577274", // "OpenWrt"
"HiddenSSID": false, "HiddenSSID": false,
"Passphrase": "some passphrase", "Passphrase": "some passphrase",
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
"Name": "WifiEapTls", "Name": "WifiEapTls",
"WiFi": { "WiFi": {
"Security": "WPA-EAP", "Security": "WPA-EAP",
"FTEnabled": true,
"EAP": { "EAP": {
"Outer": "EAP-TLS", "Outer": "EAP-TLS",
"Identity": "my_identity", "Identity": "my_identity",
......
...@@ -420,6 +420,11 @@ field **WiFi** must be set to an object of type [WiFi](#WiFi-type). ...@@ -420,6 +420,11 @@ field **WiFi** must be set to an object of type [WiFi](#WiFi-type).
*WEP-8021X* or *WPA-EAP*, otherwise ignored) - [EAP](#EAP-type) *WEP-8021X* or *WPA-EAP*, otherwise ignored) - [EAP](#EAP-type)
* EAP settings. * EAP settings.
* **FTEnabled**
* (optional, defaults to *false*) - **boolean**
* Indicating if the client should attempt to use Fast Transition with the
* network.
* **HexSSID** * **HexSSID**
* (optional if **SSID** is set, if so defaults to a hex representation of * (optional if **SSID** is set, if so defaults to a hex representation of
**SSID**) - **string** **SSID**) - **string**
......
...@@ -223,6 +223,7 @@ const char kBSSID[] = "BSSID"; ...@@ -223,6 +223,7 @@ const char kBSSID[] = "BSSID";
const char kEAP[] = "EAP"; const char kEAP[] = "EAP";
const char kFrequency[] = "Frequency"; const char kFrequency[] = "Frequency";
const char kFrequencyList[] = "FrequencyList"; const char kFrequencyList[] = "FrequencyList";
const char kFTEnabled[] = "FTEnabled";
const char kHexSSID[] = "HexSSID"; const char kHexSSID[] = "HexSSID";
const char kHiddenSSID[] = "HiddenSSID"; const char kHiddenSSID[] = "HiddenSSID";
const char kPassphrase[] = "Passphrase"; const char kPassphrase[] = "Passphrase";
......
...@@ -236,6 +236,7 @@ ONC_EXPORT extern const char kBSSID[]; ...@@ -236,6 +236,7 @@ ONC_EXPORT extern const char kBSSID[];
ONC_EXPORT extern const char kEAP[]; ONC_EXPORT extern const char kEAP[];
ONC_EXPORT extern const char kFrequency[]; ONC_EXPORT extern const char kFrequency[];
ONC_EXPORT extern const char kFrequencyList[]; ONC_EXPORT extern const char kFrequencyList[];
ONC_EXPORT extern const char kFTEnabled[];
ONC_EXPORT extern const char kHexSSID[]; ONC_EXPORT extern const char kHexSSID[];
ONC_EXPORT extern const char kHiddenSSID[]; ONC_EXPORT extern const char kHiddenSSID[];
ONC_EXPORT extern const char kPassphrase[]; ONC_EXPORT extern const char kPassphrase[];
......
...@@ -644,6 +644,7 @@ namespace networkingPrivate { ...@@ -644,6 +644,7 @@ namespace networkingPrivate {
EAPProperties? EAP; EAPProperties? EAP;
long? Frequency; long? Frequency;
long[]? FrequencyList; long[]? FrequencyList;
boolean? FTEnabled;
DOMString? HexSSID; DOMString? HexSSID;
boolean? HiddenSSID; boolean? HiddenSSID;
DOMString? Passphrase; DOMString? Passphrase;
...@@ -660,6 +661,7 @@ namespace networkingPrivate { ...@@ -660,6 +661,7 @@ namespace networkingPrivate {
ManagedEAPProperties? EAP; ManagedEAPProperties? EAP;
long? Frequency; long? Frequency;
long[]? FrequencyList; long[]? FrequencyList;
ManagedBoolean? FTEnabled;
ManagedDOMString? HexSSID; ManagedDOMString? HexSSID;
ManagedBoolean? HiddenSSID; ManagedBoolean? HiddenSSID;
ManagedDOMString? Passphrase; ManagedDOMString? Passphrase;
......
...@@ -841,6 +841,7 @@ chrome.networkingPrivate.VPNStateProperties; ...@@ -841,6 +841,7 @@ chrome.networkingPrivate.VPNStateProperties;
* EAP: (!chrome.networkingPrivate.EAPProperties|undefined), * EAP: (!chrome.networkingPrivate.EAPProperties|undefined),
* Frequency: (number|undefined), * Frequency: (number|undefined),
* FrequencyList: (!Array<number>|undefined), * FrequencyList: (!Array<number>|undefined),
* FTEnabled: (boolean|undefined),
* HexSSID: (string|undefined), * HexSSID: (string|undefined),
* HiddenSSID: (boolean|undefined), * HiddenSSID: (boolean|undefined),
* Passphrase: (string|undefined), * Passphrase: (string|undefined),
...@@ -861,6 +862,7 @@ chrome.networkingPrivate.WiFiProperties; ...@@ -861,6 +862,7 @@ chrome.networkingPrivate.WiFiProperties;
* EAP: (!chrome.networkingPrivate.ManagedEAPProperties|undefined), * EAP: (!chrome.networkingPrivate.ManagedEAPProperties|undefined),
* Frequency: (number|undefined), * Frequency: (number|undefined),
* FrequencyList: (!Array<number>|undefined), * FrequencyList: (!Array<number>|undefined),
* FTEnabled: (!chrome.networkingPrivate.ManagedBoolean|undefined),
* HexSSID: (!chrome.networkingPrivate.ManagedDOMString|undefined), * HexSSID: (!chrome.networkingPrivate.ManagedDOMString|undefined),
* HiddenSSID: (!chrome.networkingPrivate.ManagedBoolean|undefined), * HiddenSSID: (!chrome.networkingPrivate.ManagedBoolean|undefined),
* Passphrase: (!chrome.networkingPrivate.ManagedDOMString|undefined), * Passphrase: (!chrome.networkingPrivate.ManagedDOMString|undefined),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment