diff --git a/examples/apps/cli/README.md b/examples/apps/cli/README.md index c7b6ece27..41fe3b669 100644 --- a/examples/apps/cli/README.md +++ b/examples/apps/cli/README.md @@ -29,7 +29,7 @@ Active Timestamp: 1 Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 -Mesh Local Prefix: fd3d:b50b:f96d:722d/64 +Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/efr32mg1/README.md b/examples/platforms/efr32mg1/README.md index 2d60d6e32..17b5b655d 100644 --- a/examples/platforms/efr32mg1/README.md +++ b/examples/platforms/efr32mg1/README.md @@ -159,7 +159,7 @@ In the J-Link Device drop-down list select the serial number of the device to fl Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/efr32mg12/README.md b/examples/platforms/efr32mg12/README.md index 4e9fd00a4..1e978dfe4 100644 --- a/examples/platforms/efr32mg12/README.md +++ b/examples/platforms/efr32mg12/README.md @@ -172,7 +172,7 @@ In the J-Link Device drop-down list select the serial number of the device to fl Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/efr32mg13/README.md b/examples/platforms/efr32mg13/README.md index dc987dac9..f44b1b1f2 100644 --- a/examples/platforms/efr32mg13/README.md +++ b/examples/platforms/efr32mg13/README.md @@ -165,7 +165,7 @@ In the J-Link Device drop-down list select the serial number of the device to fl Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/kw41z/README.md b/examples/platforms/kw41z/README.md index bad951e07..310e84d74 100644 --- a/examples/platforms/kw41z/README.md +++ b/examples/platforms/kw41z/README.md @@ -63,7 +63,7 @@ Compiled binaries may be flashed onto the MKW41Z512 using drag-and-drop into the Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/nrf528xx/nrf52811/README.md b/examples/platforms/nrf528xx/nrf52811/README.md index 7bc20d507..1607ceb18 100644 --- a/examples/platforms/nrf528xx/nrf52811/README.md +++ b/examples/platforms/nrf528xx/nrf52811/README.md @@ -150,7 +150,7 @@ To test the example: Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/nrf528xx/nrf52833/README.md b/examples/platforms/nrf528xx/nrf52833/README.md index 153bebeda..fa377772b 100644 --- a/examples/platforms/nrf528xx/nrf52833/README.md +++ b/examples/platforms/nrf528xx/nrf52833/README.md @@ -189,7 +189,7 @@ To test the example: Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/nrf528xx/nrf52840/README.md b/examples/platforms/nrf528xx/nrf52840/README.md index 38533f8fd..127a90ea1 100644 --- a/examples/platforms/nrf528xx/nrf52840/README.md +++ b/examples/platforms/nrf528xx/nrf52840/README.md @@ -330,7 +330,7 @@ To test the example: Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/examples/platforms/samr21/README.md b/examples/platforms/samr21/README.md index 1766f3098..79b64534d 100644 --- a/examples/platforms/samr21/README.md +++ b/examples/platforms/samr21/README.md @@ -124,7 +124,7 @@ $ (gdb) c Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/src/cli/README_COMMISSIONING.md b/src/cli/README_COMMISSIONING.md index b108eaac7..f01381861 100644 --- a/src/cli/README_COMMISSIONING.md +++ b/src/cli/README_COMMISSIONING.md @@ -34,7 +34,7 @@ Form a network with the device that has Commissioner support. Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 @@ -120,7 +120,7 @@ Form a network with the device that has Commissioner support. Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/src/cli/README_DATASET.md b/src/cli/README_DATASET.md index a5544083a..3b25167b7 100644 --- a/src/cli/README_DATASET.md +++ b/src/cli/README_DATASET.md @@ -39,7 +39,7 @@ The Pending Operational Dataset is used to communicate changes to the Active Ope Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 @@ -98,7 +98,7 @@ After the device successfully attaches to a Thread network, the device will retr Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 - Mesh Local Prefix: fd3d:b50b:f96d:722d/64 + Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 @@ -175,7 +175,7 @@ Active Timestamp: 1 Channel: 13 Channel Mask: 0x07fff800 Ext PAN ID: d63e8e3e495ebbc3 -Mesh Local Prefix: fd3d:b50b:f96d:722d/64 +Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 @@ -364,7 +364,7 @@ Channel: 16 Channel Mask: 0x07fff800 Delay: 58706 Ext PAN ID: d63e8e3e495ebbc3 -Mesh Local Prefix: fd3d:b50b:f96d:722d/64 +Mesh Local Prefix: fd3d:b50b:f96d:722d::/64 Master Key: dfd34f0f05cad978ec4e32b0413038ff Network Name: OpenThread-8f28 PAN ID: 0x8f28 diff --git a/src/cli/cli_dataset.cpp b/src/cli/cli_dataset.cpp index 9c9db0a9d..05ca042be 100644 --- a/src/cli/cli_dataset.cpp +++ b/src/cli/cli_dataset.cpp @@ -117,7 +117,7 @@ otError Dataset::Print(otOperationalDataset &aDataset) { const uint8_t *prefix = aDataset.mMeshLocalPrefix.m8; mInterpreter.mServer->OutputFormat( - "Mesh Local Prefix: %x:%x:%x:%x/64\r\n", (static_cast(prefix[0]) << 8) | prefix[1], + "Mesh Local Prefix: %x:%x:%x:%x::/64\r\n", (static_cast(prefix[0]) << 8) | prefix[1], (static_cast(prefix[2]) << 8) | prefix[3], (static_cast(prefix[4]) << 8) | prefix[5], (static_cast(prefix[6]) << 8) | prefix[7]); } diff --git a/tests/scripts/expect/cli-dataset.exp b/tests/scripts/expect/cli-dataset.exp index 5d5867d72..63addc72c 100755 --- a/tests/scripts/expect/cli-dataset.exp +++ b/tests/scripts/expect/cli-dataset.exp @@ -39,7 +39,7 @@ expect -re {Channel: (\d+)} set channel $expect_out(1,string) expect -re {Channel Mask: 0x[0-9a-f]{8}} expect -re {Ext PAN ID: [0-9a-f]{16}} -expect -re {Mesh Local Prefix: ([0-9a-f]{1,4}:){3}[0-9a-f]{1,4}\/64} +expect -re {Mesh Local Prefix: ([0-9a-f]{1,4}:){3}[0-9a-f]{1,4}::\/64} expect -re {Master Key: [0-9a-f]{32}} expect -re {Network Name: [^\r\n]+} expect -re {PAN ID: 0x[0-9a-f]{4}} @@ -90,7 +90,7 @@ if {$channel == 11} { expect "Channel Mask: 0x03fff800" expect -re {Delay: \d+} expect "Ext PAN ID: aabbccddeeff0011" -expect "Mesh Local Prefix: fdde:4860:0:0/64" +expect "Mesh Local Prefix: fdde:4860:0:0::/64" expect "Master Key: aabbccddeeff00112233445566778899" expect "Network Name: OT-network" expect "PAN ID: 0xface" @@ -112,7 +112,7 @@ if {$channel == 11} { } expect "Channel Mask: 0x03fff800" expect "Ext PAN ID: aabbccddeeff0011" -expect "Mesh Local Prefix: fdde:4860:0:0/64" +expect "Mesh Local Prefix: fdde:4860:0:0::/64" expect "Master Key: aabbccddeeff00112233445566778899" expect "Network Name: OT-network" expect "PAN ID: 0xface" @@ -132,7 +132,7 @@ if {$channel == 11} { } expect "Channel Mask: 0x03fff800" expect "Ext PAN ID: aabbccddeeff0011" -expect "Mesh Local Prefix: fdde:4860:0:0/64" +expect "Mesh Local Prefix: fdde:4860:0:0::/64" expect "Master Key: aabbccddeeff00112233445566778899" expect "Network Name: OT-network" expect "PAN ID: 0xface"