espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-13 20:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[simulation] add configuration MAX_NETWORK_SIZE (#5565)

Browse Source 
Currently, the WELLKNOWN_NODE_ID = 34 is not properly defined.

- In virtual time simulation, WELLKNOWN_NODE_ID limits the number of
  ports each PORT_OFFSET can occupy. The virtual time simulator
  listens at the nodeid=0 port rather than nodeid=34 port. So, there
  is no such thing as wellknown node ID in virtual time simulation.

- In real time simulation, the sniffer listens at the nodeid=34
  port. This PR changes it to nodeid=0 port to be consistent with
  other parts.

- In posix virtual time, the simulator listens at the nodeid=0
  port. So, there is no such thing as wellknown node ID in Posix
  virtual time.

This commit changes it to MAX_NETWORK_SIZE = 33 and make it
(configuration OPENTHREAD_SIMULATION_MAX_NETWORK_SIZE) configurable in
simulation by:

- Makefile configuration: MAX_NETWORK_SIZE
- Cmake configuration: OT_SIMULATION_MAX_NETWORK_SIZE
This commit is contained in:
Simon Lin
2020-10-16 10:57:03 -07:00
committed by GitHub
parent 92078815f5
commit 913037b508
11 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/simulator.py
+2 -2
View File
@@ -137,7 +137,7 @@ class VirtualTime(BaseSimulator):
EVENT_DATA = 5
BASE_PORT = 9000
MAX_NODES = 34
MAX_NODES = 33
MAX_MESSAGE = 1024
END_OF_TIME = float('inf')
PORT_OFFSET = int(os.getenv('PORT_OFFSET', '0'))
@@ -152,7 +152,7 @@ class VirtualTime(BaseSimulator):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
ip = '127.0.0.1'
self.port = self.BASE_PORT + (self.PORT_OFFSET * self.MAX_NODES)
self.port = self.BASE_PORT + (self.PORT_OFFSET * (self.MAX_NODES + 1))
self.sock.bind((ip, self.port))
self.devices = {}
tests/scripts/thread-cert/sniffer_transport.py
+4 -4
View File
@@ -92,7 +92,7 @@ class SnifferSocketTransport(SnifferTransport):
BASE_PORT = 9000
WELLKNOWN_NODE_ID = 34
MAX_NETWORK_SIZE = 33
PORT_OFFSET = int(os.getenv('PORT_OFFSET', "0"))
@@ -110,12 +110,12 @@ class SnifferSocketTransport(SnifferTransport):
def _nodeid_to_address(self, nodeid, ip_address=''):
return (
ip_address,
self.BASE_PORT + (self.PORT_OFFSET * self.WELLKNOWN_NODE_ID) + nodeid,
self.BASE_PORT + (self.PORT_OFFSET * (self.MAX_NETWORK_SIZE + 1)) + nodeid,
)
def _address_to_nodeid(self, address):
_, port = address
return (port - self.BASE_PORT - (self.PORT_OFFSET * self.WELLKNOWN_NODE_ID))
return (port - self.BASE_PORT - (self.PORT_OFFSET * (self.MAX_NETWORK_SIZE + 1)))
def open(self):
if self.is_opened:
@@ -130,7 +130,7 @@ class SnifferSocketTransport(SnifferTransport):
self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
self._socket.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP,
socket.inet_aton(self.RADIO_GROUP) + socket.inet_aton('127.0.0.1'))
self._socket.bind(self._nodeid_to_address(self.WELLKNOWN_NODE_ID))
self._socket.bind(self._nodeid_to_address(0))
def close(self):
if not self.is_opened: