[mle] remove secure data request mode bit (#5560)

- Always set to 1 on transmission.
- Always ignore on reception.
This commit is contained in:
Jonathan Hui
2020-09-29 15:30:37 -07:00
committed by GitHub
parent 1f834a56c5
commit dc9b032dad
151 changed files with 732 additions and 785 deletions
@@ -946,10 +946,10 @@ class HarnessCase(unittest.TestCase):
self.dut.mode = 's'
self.dut.child_timeout = self.child_timeout
elif 'End Device' in body:
self.dut.mode = 'rsn'
self.dut.mode = 'rn'
self.dut.child_timeout = self.child_timeout
else:
self.dut.mode = 'rsdn'
self.dut.mode = 'rdn'
if 'at channel' in body:
self.channel = int(body.split(':')[1])
+8 -8
View File
@@ -1049,7 +1049,7 @@ class OpenThreadTHCI(object):
print(eRoleId)
self.deviceRole = eRoleId
mode = ''
mode = '-'
try:
if ModuleHelper.LeaderDutChannelFound:
self.channel = ModuleHelper.Default_Channel
@@ -1058,36 +1058,36 @@ class OpenThreadTHCI(object):
# only sleep end device requires stable networkdata now
if eRoleId == Thread_Device_Role.Leader:
print('join as leader')
mode = 'rsdn'
mode = 'rdn'
if self.AutoDUTEnable is False:
# set ROUTER_DOWNGRADE_THRESHOLD
self.__setRouterDowngradeThreshold(33)
elif eRoleId == Thread_Device_Role.Router:
print('join as router')
mode = 'rsdn'
mode = 'rdn'
if self.AutoDUTEnable is False:
# set ROUTER_DOWNGRADE_THRESHOLD
self.__setRouterDowngradeThreshold(33)
elif eRoleId == Thread_Device_Role.SED:
print('join as sleepy end device')
mode = 's'
mode = '-'
self.__setPollPeriod(self.__sedPollPeriod)
elif eRoleId == Thread_Device_Role.EndDevice:
print('join as end device')
mode = 'rsn'
mode = 'rn'
elif eRoleId == Thread_Device_Role.REED:
print('join as REED')
mode = 'rsdn'
mode = 'rdn'
# set ROUTER_UPGRADE_THRESHOLD
self.__setRouterUpgradeThreshold(0)
elif eRoleId == Thread_Device_Role.EndDevice_FED:
print('join as FED')
mode = 'rsdn'
mode = 'rdn'
# always remain an ED, never request to be a router
self.__disableRouterEligible()
elif eRoleId == Thread_Device_Role.EndDevice_MED:
print('join as MED')
mode = 'rsn'
mode = 'rn'
else:
pass
+7 -7
View File
@@ -307,7 +307,7 @@ class OpenThread_WpanCtl(IThci):
"""set thread device mode:
Args:
mode: thread device mode. 15=rsdn, 13=rsn, 4=s
mode: thread device mode. 11=rdn, 9=rn
r: rx-on-when-idle
s: secure IEEE 802.15.4 data request
d: full thread device
@@ -1177,14 +1177,14 @@ class OpenThread_WpanCtl(IThci):
# only sleep end device requires stable networkdata now
if eRoleId == Thread_Device_Role.Leader:
print('join as leader')
# rsdn
# rdn
mode = 15
if self.AutoDUTEnable is False:
# set ROUTER_DOWNGRADE_THRESHOLD
self.__setRouterDowngradeThreshold(33)
elif eRoleId == Thread_Device_Role.Router:
print('join as router')
# rsdn
# rdn
mode = 15
if self.AutoDUTEnable is False:
# set ROUTER_DOWNGRADE_THRESHOLD
@@ -1196,24 +1196,24 @@ class OpenThread_WpanCtl(IThci):
self.__setPollPeriod(self.__sedPollPeriod)
elif eRoleId == Thread_Device_Role.EndDevice:
print('join as end device')
# rsn
# rn
mode = 13
elif eRoleId == Thread_Device_Role.REED:
print('join as REED')
# rsdn
# rdn
mode = 15
# set ROUTER_UPGRADE_THRESHOLD
self.__setRouterUpgradeThreshold(0)
elif eRoleId == Thread_Device_Role.EndDevice_FED:
# always remain an ED, never request to be a router
print('join as FED')
# rsdn
# rdn
mode = 15
# set ROUTER_UPGRADE_THRESHOLD
self.__setRouterUpgradeThreshold(0)
elif eRoleId == Thread_Device_Role.EndDevice_MED:
print('join as MED')
# rsn
# rn
mode = 13
else:
pass