Skip to content

Commit

Permalink
Merge branch 'feature/add_mesh_local_prefix_config' into 'master'
Browse files Browse the repository at this point in the history
feat(openthread): add mesh local prefix configuration

See merge request espressif/esp-idf!25099
  • Loading branch information
chshu committed Sep 5, 2023
2 parents b4c7b13 + 8eff9df commit 32ad8f1
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 5 deletions.
7 changes: 7 additions & 0 deletions components/openthread/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ menu "OpenThread"
string "OpenThread network name"
default "OpenThread-ESP"

config OPENTHREAD_MESH_LOCAL_PREFIX
string "OpenThread mesh local prefix, format <address>/<plen>"
default "fd00:db8:a0:0::/64"
help
A string in the format "<address>/<plen>", where `<address>` is an IPv6
address and `<plen>` is a prefix length. For example "fd00:db8:a0:0::/64"

config OPENTHREAD_NETWORK_CHANNEL
int "OpenThread network channel"
range 11 26
Expand Down
23 changes: 19 additions & 4 deletions components/openthread/src/esp_openthread.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include "openthread/tasklet.h"
#include "openthread/thread.h"

#if CONFIG_OPENTHREAD_FTD
#include "openthread/dataset_ftd.h"
#endif

static int hex_digit_to_int(char hex)
{
if ('A' <= hex && hex <= 'F') {
Expand Down Expand Up @@ -87,13 +91,14 @@ esp_err_t esp_openthread_auto_start(otOperationalDatasetTlvs *datasetTlvs)
if (datasetTlvs) {
ESP_RETURN_ON_FALSE(otDatasetSetActiveTlvs(instance, datasetTlvs) == OT_ERROR_NONE, ESP_FAIL, OT_PLAT_LOG_TAG,
"Failed to set OpenThread active dataset");
}
else {
} else {
otOperationalDataset dataset;
size_t len = 0;

#if CONFIG_OPENTHREAD_FTD
otDatasetCreateNewNetwork(instance, &dataset);
#else
memset(&dataset, 0, sizeof(otOperationalDataset));

#endif
// Active timestamp
dataset.mActiveTimestamp.mSeconds = 1;
dataset.mActiveTimestamp.mTicks = 0;
Expand All @@ -117,6 +122,16 @@ esp_err_t esp_openthread_auto_start(otOperationalDatasetTlvs *datasetTlvs)
"Cannot convert OpenThread extended pan id");
dataset.mComponents.mIsExtendedPanIdPresent = true;

// Mesh Local Prefix
otIp6Prefix prefix;
memset(&prefix, 0, sizeof(otIp6Prefix));
if (otIp6PrefixFromString(CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX, &prefix) == OT_ERROR_NONE) {
memcpy(dataset.mMeshLocalPrefix.m8, prefix.mPrefix.mFields.m8, sizeof(dataset.mMeshLocalPrefix.m8));
dataset.mComponents.mIsMeshLocalPrefixPresent = true;
} else {
ESP_LOGE("Falied to parse mesh local prefix", CONFIG_OPENTHREAD_MESH_LOCAL_PREFIX);
}

// Network Key
len = hex_string_to_binary(CONFIG_OPENTHREAD_NETWORK_MASTERKEY, dataset.mNetworkKey.m8,
sizeof(dataset.mNetworkKey.m8));
Expand Down
9 changes: 9 additions & 0 deletions examples/openthread/ot_cli/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
menu "OpenThread CLI Example"

config OPENTHREAD_AUTO_START
bool 'Enable the automatic start mode.'
default False
help
If enabled, the Openthread Device will create or connect to thread network with pre-configured
network parameters automatically. Otherwise, user need to configure Thread via CLI command manually.
endmenu
7 changes: 6 additions & 1 deletion examples/openthread/ot_cli/main/esp_ot_cli.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: CC0-1.0
*
Expand Down Expand Up @@ -86,6 +86,11 @@ static void ot_task_worker(void *aContext)
// Run the main loop
#if CONFIG_OPENTHREAD_CLI
esp_openthread_cli_create_task();
#endif
#if CONFIG_OPENTHREAD_AUTO_START
otOperationalDatasetTlvs dataset;
otError error = otDatasetGetActiveTlvs(esp_openthread_get_instance(), &dataset);
ESP_ERROR_CHECK(esp_openthread_auto_start((error == OT_ERROR_NONE) ? &dataset : NULL));
#endif
esp_openthread_launch_mainloop();

Expand Down

0 comments on commit 32ad8f1

Please sign in to comment.