christian
/
quicp2p
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix maximum number of outbound packets and maximum number of sockets

This commit is contained in:
Christian Ulrich 2020-11-22 14:06:25 +01:00
parent 7d08bbeeb7
commit cd3a7e99f5
No known key found for this signature in database
GPG Key ID: 8241BE099775A097
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
puncher.nim
View File

@ -27,9 +27,10 @@ var IPPROTO_IP {.importc: "IPPROTO_IP", header: "<netinet/in.h>".}: cint
var IP_TTL {.importc: "IP_TTL", header: "<netinet/in.h>".}: cint var IP_TTL {.importc: "IP_TTL", header: "<netinet/in.h>".}: cint
const Timeout = 3000 const Timeout = 3000
const InitiatorMaxSockCount = 1000 const InitiatorMaxOutPacketCount = 1000
const ResponderMaxSockCount = 70 const ResponderMaxOutPacketCount = 70
const MaxSockCount = max(InitiatorMaxSockCount, ResponderMaxSockCount) const MaxOutPacketCount = max(InitiatorMaxOutPacketCount,
ResponderMaxOutPacketCount)
proc srcPort(sock: AsyncSocket): Port = proc srcPort(sock: AsyncSocket): Port =
result = sock.getLocalAddr[1] result = sock.getLocalAddr[1]
@ -50,8 +51,8 @@ proc initPuncher*(sock: AsyncSocket, probedSrcPorts: seq[Port]): Puncher =
# our NAT is of the evil symmetric type with random port allocation. We are # our NAT is of the evil symmetric type with random port allocation. We are
# trying to help the other peer by allocating a lot of auxillary sockets # trying to help the other peer by allocating a lot of auxillary sockets
# for punching more holes # for punching more holes
result.socks.setLen(MaxSockCount) result.socks.setLen(MaxOutPacketCount)
for i in 1 .. MaxSockCount - 1: for i in 1 .. MaxOutPacketCount - 1:
result.socks[i] = newAsyncSocket(sockType = SOCK_DGRAM, result.socks[i] = newAsyncSocket(sockType = SOCK_DGRAM,
protocol = IPPROTO_UDP, buffered = false) protocol = IPPROTO_UDP, buffered = false)
result.socks[i].bindAddr(Port(0)) result.socks[i].bindAddr(Port(0))
@ -64,20 +65,18 @@ proc punch(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
Future[Attempt] {.async.} = Future[Attempt] {.async.} =
let punchFuture = newFuture[(AsyncSocket, Port)]("punch") let punchFuture = newFuture[(AsyncSocket, Port)]("punch")
let peerNatProps = getNatProperties(peerPort, peerProbedPorts) let peerNatProps = getNatProperties(peerPort, peerProbedPorts)
let maxOutPacketCount = if isInitiating:
InitiatorMaxOutPacketCount
else:
ResponderMaxOutPacketCount
var sockCount = 1 var sockCount = 1
if puncher.natProps.natType == SymmetricRandom: if puncher.natProps.natType == SymmetricRandom:
# Our NAT is of the evil symmetric type with random port allocation. We are
# trying to help the other peer by punching more holes using all our
# sockets.
if peerNatProps.natType == SymmetricRandom: if peerNatProps.natType == SymmetricRandom:
# If the other peer is behind a SymmetricRandom NAT too we give up. # If both peers are behind a SymmetricRandom NAT we give up.
raise newException(PunchHoleError, raise newException(PunchHoleError,
"both peers behind symmetric NAT with random port allocation") "both peers behind symmetric NAT with random port allocation")
sockCount = if isInitiating: sockCount = maxOutPacketCount
InitiatorMaxSockCount let predictedDstPorts = predictPortRange(peerNatProps, maxOutPacketCount.uint16)
else:
ResponderMaxSockCount
let predictedDstPorts = predictPortRange(peerNatProps, sockCount.uint16)
result = Attempt(dstIp: peerIp, dstPorts: predictedDstPorts, result = Attempt(dstIp: peerIp, dstPorts: predictedDstPorts,
future: punchFuture) future: punchFuture)
if puncher.attempts.contains(result): if puncher.attempts.contains(result):