mirror of
https://github.com/espressif/openthread.git
synced 2026-07-30 15:47:46 +00:00
[thci] match meshlocalprefix accurately to classify the addresses correctly (#3639)
This commit is contained in:
@@ -254,7 +254,7 @@ class OpenThread(IThci):
|
||||
# link local address
|
||||
if ip6Addr.split(':')[4] != '0':
|
||||
linkLocal64Addr = ip6Addr
|
||||
elif ip6AddrPrefix == 'fd00':
|
||||
elif ip6Addr.startswith(self.meshLocalPrefix):
|
||||
# mesh local address
|
||||
if ip6Addr.split(':')[4] == '0':
|
||||
# rloc
|
||||
@@ -1257,7 +1257,7 @@ class OpenThread(IThci):
|
||||
self.channelMask = "0x7fff800" #(0xffff << 11)
|
||||
self.panId = ModuleHelper.Default_PanId
|
||||
self.xpanId = ModuleHelper.Default_XpanId
|
||||
self.localprefix = ModuleHelper.Default_MLPrefix
|
||||
self.meshLocalPrefix = ModuleHelper.Default_MLPrefix
|
||||
self.pskc = "00000000000000000000000000000000" # OT only accept hex format PSKc for now
|
||||
self.securityPolicySecs = ModuleHelper.Default_SecurityPolicy
|
||||
self.securityPolicyFlags = "onrcb"
|
||||
@@ -1287,7 +1287,7 @@ class OpenThread(IThci):
|
||||
self.setXpanId(self.xpanId)
|
||||
self.setNetworkName(self.networkName)
|
||||
self.setNetworkKey(self.networkKey)
|
||||
self.setMLPrefix(self.localprefix)
|
||||
self.setMLPrefix(self.meshLocalPrefix)
|
||||
self.setPSKc(self.pskc)
|
||||
self.setActiveTimestamp(self.activetimestamp)
|
||||
except Exception, e:
|
||||
|
||||
@@ -332,7 +332,7 @@ class OpenThread_WpanCtl(IThci):
|
||||
# link local address
|
||||
if ip6Addr.split(':')[4] != '0':
|
||||
linkLocal64Addr = ip6Addr
|
||||
elif ip6AddrPrefix == 'fd00':
|
||||
elif ip6Addr.startswith(self.meshLocalPrefix):
|
||||
# mesh local address
|
||||
if ip6Addr.split(':')[4] == '0':
|
||||
# rloc
|
||||
@@ -1451,7 +1451,7 @@ class OpenThread_WpanCtl(IThci):
|
||||
self.channelMask = "0x7fff800" #(0xffff << 11)
|
||||
self.panId = ModuleHelper.Default_PanId
|
||||
self.xpanId = ModuleHelper.Default_XpanId
|
||||
self.localprefix = ModuleHelper.Default_MLPrefix
|
||||
self.meshLocalPrefix = ModuleHelper.Default_MLPrefix
|
||||
self.pskc = "00000000000000000000000000000000" # OT only accept hex format PSKc for now
|
||||
self.securityPolicySecs = ModuleHelper.Default_SecurityPolicy
|
||||
self.securityPolicyFlags = "onrcb"
|
||||
@@ -1480,7 +1480,7 @@ class OpenThread_WpanCtl(IThci):
|
||||
self.setXpanId(self.xpanId)
|
||||
self.setNetworkName(self.networkName)
|
||||
self.setNetworkKey(self.networkKey)
|
||||
self.setMLPrefix(self.localprefix)
|
||||
self.setMLPrefix(self.meshLocalPrefix)
|
||||
self.setPSKc(self.pskc)
|
||||
self.setActiveTimestamp(self.activetimestamp)
|
||||
except Exception, e:
|
||||
|
||||
Reference in New Issue
Block a user