logos-storage/logos-storage-nim
1
0
Fork 0
mirror of https://github.com/logos-storage/logos-storage-nim.git synced 2026-06-28 21:39:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup nat simulation

Browse Source
This commit is contained in:
Arnaud 2026-05-25 11:55:40 +04:00
parent 8d8f19c6ad
commit 4457c4856d
No known key found for this signature in database
GPG Key ID: A6C7C781817146FA
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/utils/natsimulation.nim
View File

@ -138,8 +138,9 @@ method accept*(
continue
var localPort = Port(0)
if self.addrs.len > 0:
let localAddr = initTAddress(self.addrs[0])
if conn.localAddr.isSome:
# Local address read from the accepted socket.
let localAddr = initTAddress(conn.localAddr.get)
if localAddr.isOk:
localPort = localAddr.get.port

26
tests/storage/testnatsimulation.nim
View File

@ -10,6 +10,17 @@ import ../../storage/utils/natsimulation
const flags = {ServerFlags.ReuseAddr}
const listenAddr = "/ip4/127.0.0.1/tcp/0"
const filterTimeout = 500.millis
proc cannotConnect(a, b: Switch): Future[bool] {.async.} =
let completed =
try:
await a.connect(b.peerInfo.peerId, b.peerInfo.addrs).withTimeout(filterTimeout)
except LPError:
false
if completed:
return false
return not a.isConnected(b.peerInfo.peerId)
proc newSwitch(rng: Rng): Switch =
SwitchBuilder
@ -81,8 +92,7 @@ asyncchecksuite "NatTransport - Address-Dependent Filtering":
check thirdNode.isConnected(natNode.peerInfo.peerId)
test "bootstrap cannot connect to nat node without a pre-existing connection":
expect(LPError):
await bootstrap.connect(natNode.peerInfo.peerId, natNode.peerInfo.addrs)
check await cannotConnect(bootstrap, natNode)
asyncchecksuite "NatTransport - Address-and-Port-Dependent Filtering":
var bootstrap, thirdNode, natNode: Switch
@ -109,13 +119,11 @@ asyncchecksuite "NatTransport - Address-and-Port-Dependent Filtering":
check bootstrap.isConnected(natNode.peerInfo.peerId)
test "bootstrap cannot connect to nat node without a pre-existing connection":
expect(LPError):
await bootstrap.connect(natNode.peerInfo.peerId, natNode.peerInfo.addrs)
check await cannotConnect(bootstrap, natNode)
test "third node cannot connect to nat node even after nat node connected to bootstrap":
await natNode.connect(bootstrap.peerInfo.peerId, bootstrap.peerInfo.addrs)
expect(LPError):
await thirdNode.connect(natNode.peerInfo.peerId, natNode.peerInfo.addrs)
check await cannotConnect(thirdNode, natNode)
asyncchecksuite "NatTransport - Double NAT":
var bootstrap, natNode: Switch
@ -138,8 +146,7 @@ asyncchecksuite "NatTransport - Double NAT":
natMapper.activeTcpPort = some(actualPort)
router.natMapper = some(natMapper)
expect(LPError):
await bootstrap.connect(natNode.peerInfo.peerId, natNode.peerInfo.addrs)
check await cannotConnect(bootstrap, natNode)
asyncchecksuite "NatTransport - Port Mapping":
var bootstrap, natNode: Switch
@ -170,5 +177,4 @@ asyncchecksuite "NatTransport - Port Mapping":
natMapper.activeTcpPort = some(Port(1))
router.natMapper = some(natMapper)
expect(LPError):
await bootstrap.connect(natNode.peerInfo.peerId, natNode.peerInfo.addrs)
check await cannotConnect(bootstrap, natNode)