michaelh/zephyr
1
0
Fork 0
Code Releases Activity

manifest: update openthread

Browse source 
Regular OpenThread upmerge to bring in a fix for a possible
infinite loop and support for DNS service subtypes.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
This commit is contained in:
Damian Krolik 2021-07-05 17:38:39 +02:00 • committed by Maureen Helm
commit bf3c6e7ba4
8 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
samples/net/lwm2m_client/overlay-ot.conf
View file

@ -27,7 +27,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
CONFIG_OPENTHREAD_CHANNEL=26 CONFIG_OPENTHREAD_CHANNEL=26
CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"

2
samples/net/sockets/echo_client/overlay-ot.conf
View file

@ -24,7 +24,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
CONFIG_OPENTHREAD_CHANNEL=26 CONFIG_OPENTHREAD_CHANNEL=26
CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"

2
samples/net/sockets/echo_server/overlay-ot.conf
View file

@ -24,7 +24,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
CONFIG_OPENTHREAD_CHANNEL=26 CONFIG_OPENTHREAD_CHANNEL=26
CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::2" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::2"
CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::1"

7
subsys/net/l2/openthread/Kconfig.features
View file

@ -183,8 +183,11 @@ config OPENTHREAD_OTNS
config OPENTHREAD_FULL_LOGS config OPENTHREAD_FULL_LOGS
bool "Enable OpenThread full logs" bool "Enable OpenThread full logs"
config OPENTHREAD_LINK_METRICS config OPENTHREAD_LINK_METRICS_INITIATOR
bool "Enable Link Metrics support" bool "Enable Link Metrics initiator"
config OPENTHREAD_LINK_METRICS_SUBJECT
bool "Enable Link Metrics subject"
config OPENTHREAD_SRP_CLIENT config OPENTHREAD_SRP_CLIENT
bool "Enable SRP Client support" bool "Enable SRP Client support"

6
subsys/net/l2/openthread/Kconfig.thread
View file

@ -24,10 +24,10 @@ config OPENTHREAD_XPANID
Extended PAN ID for OpenThread with Extended PAN ID for OpenThread with
format "de:ad:00:be:ef:00:ca:fe" format "de:ad:00:be:ef:00:ca:fe"
config OPENTHREAD_MASTERKEY config OPENTHREAD_NETWORKKEY
string "Default Thread Master Key" string "Default Thread Network Key"
help help
Master Key for OpenThread with format Network Key for OpenThread with format
"00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff" "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
config OPENTHREAD_JOINER_AUTOSTART config OPENTHREAD_JOINER_AUTOSTART

16
subsys/net/l2/openthread/openthread.c
View file

@ -70,10 +70,10 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
#define OT_XPANID "" #define OT_XPANID ""
#endif #endif
#if defined(CONFIG_OPENTHREAD_MASTERKEY) #if defined(CONFIG_OPENTHREAD_NETWORKKEY)
#define OT_MASTERKEY CONFIG_OPENTHREAD_MASTERKEY #define OT_NETWORKKEY CONFIG_OPENTHREAD_NETWORKKEY
#else #else
#define OT_MASTERKEY "" #define OT_NETWORKKEY ""
#endif #endif
#if defined(CONFIG_OPENTHREAD_JOINER_PSKD) #if defined(CONFIG_OPENTHREAD_JOINER_PSKD)
@ -395,7 +395,7 @@ int openthread_start(struct openthread_context *ot_context)
NET_DBG("Loading OpenThread default configuration."); NET_DBG("Loading OpenThread default configuration.");
otExtendedPanId xpanid; otExtendedPanId xpanid;
otMasterKey masterkey; otNetworkKey networkKey;
otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME); otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
otLinkSetChannel(ot_instance, OT_CHANNEL); otLinkSetChannel(ot_instance, OT_CHANNEL);
@ -403,10 +403,10 @@ int openthread_start(struct openthread_context *ot_context)
net_bytes_from_str(xpanid.m8, 8, (char *)OT_XPANID); net_bytes_from_str(xpanid.m8, 8, (char *)OT_XPANID);
otThreadSetExtendedPanId(ot_instance, &xpanid); otThreadSetExtendedPanId(ot_instance, &xpanid);
if (strlen(OT_MASTERKEY)) { if (strlen(OT_NETWORKKEY)) {
net_bytes_from_str(masterkey.m8, OT_MASTER_KEY_SIZE, net_bytes_from_str(networkKey.m8, OT_NETWORK_KEY_SIZE,
(char *)OT_MASTERKEY); (char *)OT_NETWORKKEY);
otThreadSetMasterKey(ot_instance, &masterkey); otThreadSetNetworkKey(ot_instance, &networkKey);
} }
} }

5
subsys/net/lib/openthread/platform/radio.c
View file

@ -1066,7 +1066,7 @@ uint8_t otPlatRadioGetCslAccuracy(otInstance *aInstance)
return radio_api->get_sch_acc(radio_dev); return radio_api->get_sch_acc(radio_dev);
} }
#if defined(CONFIG_OPENTHREAD_LINK_METRICS) #if defined(CONFIG_OPENTHREAD_LINK_METRICS_SUBJECT)
/** /**
* Header IE format - IEEE Std. 802.15.4-2015, 7.4.2.1 && 7.4.2.2 * Header IE format - IEEE Std. 802.15.4-2015, 7.4.2.1 && 7.4.2.2
* *
@ -1180,4 +1180,5 @@ otError otPlatRadioConfigureEnhAckProbing(otInstance *aInstance, otLinkMetrics a
return result ? OT_ERROR_FAILED : OT_ERROR_NONE; return result ? OT_ERROR_FAILED : OT_ERROR_NONE;
} }
#endif /* OPENTHREAD_CONFIG_MLE_LINK_METRICS_ENABLE */
#endif /* CONFIG_OPENTHREAD_LINK_METRICS_SUBJECT */

2
west.yml
View file

@ -130,7 +130,7 @@ manifest:
revision: 6010f0523cbc75f551d9256cf782f173177acdef revision: 6010f0523cbc75f551d9256cf782f173177acdef
path: modules/lib/open-amp path: modules/lib/open-amp
- name: openthread - name: openthread
revision: d7eaf6f421569bb9f6be64db4c8108e53e4278b6 revision: eae63bb47a31ed61d008f49a024873026626ebcc
path: modules/lib/openthread path: modules/lib/openthread
- name: segger - name: segger
revision: 3a52ab222133193802d3c3b4d21730b9b1f1d2f6 revision: 3a52ab222133193802d3c3b4d21730b9b1f1d2f6