summaryrefslogtreecommitdiffstats
path: root/components/onc
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2015-01-13 09:14:27 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-13 17:16:01 +0000
commit63f02baf9abbb2f28e2f1676ed10310fcf22eeb2 (patch)
treefee99e352b89336b66261f25ff017017d12d6cb0 /components/onc
parentd8c8e56321d4c9135ad7d5015db99fbb0e2ec4c2 (diff)
downloadchromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.zip
chromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.tar.gz
chromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.tar.bz2
ONC: Use HexSSID instead of SSID.
- Comparison of a network policy with network will use HexSSID now. - Translation from ONC to Shill now copies the HexSSID instead of translating SSID. - Fix ONC validation of HexSSID/SSID to be case insensitive. - When setting an ONC: SSID will be ignored if HexSSID is present - Reading network properties reports a HexSSID in ONC. BUG=432546 Review URL: https://codereview.chromium.org/823633004 Cr-Commit-Position: refs/heads/master@{#311281}
Diffstat (limited to 'components/onc')
-rw-r--r--components/onc/docs/onc_spec.html23
1 files changed, 13 insertions, 10 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index f33fdee..8bf7e6d 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -698,12 +698,7 @@
a hex representation of <span class="field">SSID</span>)
<span class="type">string</span>
</span>
- Hex representation of the network's SSID. If the
- <span class="field">SSID</span> field is set, but
- <span class="field">HexSSID</span> is not, converts the contents of the
- <span class="field">SSID</span> field to UTF-8 encoding,
- creates the hex representation and assigns the result to
- <span class="field">HexSSID</span>.
+ Hex representation of the network's SSID.
</dd>
<dt class="field">HiddenSSID</dt>
@@ -748,12 +743,20 @@
<dt class="field">SSID</dt>
<dd>
<span class="field_meta">
- (optional if <span class="field">HexSSID</span> is set)
+ (optional if <span class="field">HexSSID</span> is set, otherwise
+ ignored)
<span class="type">string</span>
</span>
- SSID of the network. This field can only used for unicode strings in the
- UTF-8 encoding. For non-UTF-8 encodings the
- <span class="field">HexSSID</span> field must be used.
+ Property to access the decoded SSID of a network.<br/>
+ If this field is set, but <span class="field">HexSSID</span> is not,
+ its value will be UTF-8 encoded and the hex representation will be
+ assigned to <span class="field">HexSSID</span>. To configure a non-UTF-8
+ SSID, field <span class="field">HexSSID</span> must be used.<br/>
+ When reading the configuration of a network, both this field and
+ <span class="field">HexSSID</span> might be set. Then this field is the
+ decoding of <span class="field">HexSSID</span>. If possible the HexSSID is
+ decoded using UTF-8, otherwise an encoding is guessed on a best effort
+ basis.
</dd>
<dt class="field">SignalStrength</dt>