espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-15 07:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that Network Name strings are NULL-termianted for client code. (#368)

Browse Source 
* otGetNetworkName() no longer returns a pointer into a beacon message.
* Scan results no longer point into a beacon message.
This commit is contained in:
Jonathan Hui
2016-08-12 11:07:09 -07:00
committed by GitHub
parent 7d9b65e7a1
commit 8252cd6277
9 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+5 -19
View File
@@ -883,7 +883,7 @@ void Interpreter::ProcessNetworkName(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%.*s\r\n", OT_NETWORK_NAME_SIZE, otGetNetworkName());
sServer->OutputFormat("%.*s\r\n", OT_NETWORK_NAME_MAX_SIZE, otGetNetworkName());
}
else
{
@@ -1456,25 +1456,11 @@ void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult)
sServer->OutputFormat("| %d ", aResult->mIsJoinable);
if (aResult->mNetworkName != NULL)
{
sServer->OutputFormat("| %-16s ", aResult->mNetworkName);
}
else
{
sServer->OutputFormat("| ---------------- ");
}
sServer->OutputFormat("| %-16s ", aResult->mNetworkName.m8);
if (aResult->mExtPanId != NULL)
{
sServer->OutputFormat("| ");
OutputBytes(aResult->mExtPanId, OT_EXT_PAN_ID_SIZE);
sServer->OutputFormat(" ");
}
else
{
sServer->OutputFormat("| ---------------- ");
}
sServer->OutputFormat("| ");
OutputBytes(aResult->mExtendedPanId.m8, OT_EXT_PAN_ID_SIZE);
sServer->OutputFormat(" ");
sServer->OutputFormat("| %04x | ", aResult->mPanId);
OutputBytes(aResult->mExtAddress.m8, OT_EXT_ADDRESS_SIZE);
src/cli/cli_dataset.cpp
+1 -1
View File
@@ -306,7 +306,7 @@ ThreadError Dataset::ProcessNetworkName(int argc, char *argv[])
size_t length;
VerifyOrExit(argc > 0, error = kThreadError_Parse);
VerifyOrExit((length = strlen(argv[0])) <= OT_NETWORK_NAME_SIZE, error = kThreadError_Parse);
VerifyOrExit((length = strlen(argv[0])) <= OT_NETWORK_NAME_MAX_SIZE, error = kThreadError_Parse);
memset(&sDataset.mNetworkName, 0, sizeof(sDataset.mNetworkName));
memcpy(sDataset.mNetworkName.m8, argv[0], length);