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

try IP_TTL = 2 for ACK packets

This commit is contained in:
Christian Ulrich 2020-11-18 09:31:09 +01:00
parent 49bebb5520
commit 2b1cd9eeca
No known key found for this signature in database
GPG Key ID: 8241BE099775A097
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
puncher.nim
View File

@ -1,6 +1,11 @@
import asyncdispatch, asyncnet, net, port_prediction, strformat import asyncdispatch, asyncnet, net, port_prediction, strformat
from nativesockets import SockAddr, SockAddr_storage, SockLen from nativesockets import
SockAddr,
SockAddr_storage,
SockLen,
getSockOptInt,
setSockOptInt
from sequtils import any from sequtils import any
type type
@ -17,6 +22,9 @@ type
PunchHoleError* = object of ValueError PunchHoleError* = object of ValueError
var IPPROTO_IP {.importc: "IPPROTO_IP", header: "<netinet/in.h>".}: cint
var IP_TTL {.importc: "IP_TTL", header: "<netinet/in.h>".}: cint
const Timeout = 3000 const Timeout = 3000
proc `==`(a, b: Attempt): bool = proc `==`(a, b: Attempt): bool =
@ -31,7 +39,8 @@ proc initPuncher*(sock: AsyncSocket): Puncher =
Puncher(sock: sock) Puncher(sock: sock)
proc punch(puncher: Puncher, peerIp: IpAddress, peerPort: Port, proc punch(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
peerProbedPorts: seq[Port], msg: string): Future[Port] {.async.} = peerProbedPorts: seq[Port], lowTTL: bool, msg: string): Future[Port]
{.async.} =
let punchFuture = newFuture[Port]("punch") let punchFuture = newFuture[Port]("punch")
let predictedDstPorts = predictPortRange(peerPort, peerProbedPorts) let predictedDstPorts = predictPortRange(peerPort, peerProbedPorts)
let (_, myPort) = puncher.sock.getLocalAddr() let (_, myPort) = puncher.sock.getLocalAddr()
@ -45,11 +54,17 @@ proc punch(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
var peerAddr: Sockaddr_storage var peerAddr: Sockaddr_storage
var peerSockLen: SockLen var peerSockLen: SockLen
try: try:
var defaultTTL: int
if lowTTL:
defaultTTL = puncher.sock.getFd.getSockOptInt(IPPROTO_IP, IP_TTL)
puncher.sock.getFd.setSockOptInt(IPPROTO_IP, IP_TTL, 2)
for dstPort in attempt.dstPorts: for dstPort in attempt.dstPorts:
toSockAddr(attempt.dstIp, dstPort, peerAddr, peerSockLen) toSockAddr(attempt.dstIp, dstPort, peerAddr, peerSockLen)
# TODO: replace asyncdispatch.sendTo with asyncnet.sendTo (Nim 1.4 required) # TODO: replace asyncdispatch.sendTo with asyncnet.sendTo (Nim 1.4 required)
await sendTo(puncher.sock.getFd().AsyncFD, msg.cstring, msg.len, await sendTo(puncher.sock.getFd().AsyncFD, msg.cstring, msg.len,
cast[ptr SockAddr](addr peerAddr), peerSockLen) cast[ptr SockAddr](addr peerAddr), peerSockLen)
if lowTTL:
puncher.sock.getFd.setSockOptInt(IPPROTO_IP, IP_TTL, defaultTTL)
await punchFuture or sleepAsync(Timeout) await punchFuture or sleepAsync(Timeout)
if punchFuture.finished(): if punchFuture.finished():
result = punchFuture.read() result = punchFuture.read()
@ -60,11 +75,11 @@ proc punch(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
proc initiate*(puncher: Puncher, peerIp: IpAddress, peerPort: Port, proc initiate*(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
peerProbedPorts: seq[Port]): Future[Port] = peerProbedPorts: seq[Port]): Future[Port] =
punch(puncher, peerIp, peerPort, peerProbedPorts, "SYN") punch(puncher, peerIp, peerPort, peerProbedPorts, true, "SYN")
proc respond*(puncher: Puncher, peerIp: IpAddress, peerPort: Port, proc respond*(puncher: Puncher, peerIp: IpAddress, peerPort: Port,
peerProbedPorts: seq[Port]): Future[Port] = peerProbedPorts: seq[Port]): Future[Port] =
punch(puncher, peerIp, peerPort, peerProbedPorts, "ACK") punch(puncher, peerIp, peerPort, peerProbedPorts, false, "ACK")
proc handleMsg*(puncher: Puncher, msg: string, peerIp: IpAddress, proc handleMsg*(puncher: Puncher, msg: string, peerIp: IpAddress,
peerPort: Port) = peerPort: Port) =