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

fix 'seq changed while iterating' bug

This commit is contained in:
Christian Ulrich 2020-11-08 01:36:03 +01:00
parent 6e7ab9369d
commit 272cb2f497
No known key found for this signature in database
GPG Key ID: 8241BE099775A097
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
quicp2p.nim
View File

@ -172,25 +172,27 @@ proc initContext(sock: AsyncSocket, certChainPath: string, keyPath: string,
result.tlsCtx.signCertificate = addr result.signCertificate.super result.tlsCtx.signCertificate = addr result.signCertificate.super
proc sendPackets(ctx: QuicP2PContext) = proc sendPackets(ctx: QuicP2PContext) =
for c in ctx.connections: let conns = ctx.connections
for i in 0 .. conns.len - 1:
var srcAddr, dstAddr: quicly_address_t var srcAddr, dstAddr: quicly_address_t
var dgrams: array[10, IOVec] var dgrams: array[10, IOVec]
var dgramCount = dgrams.len().csize_t var dgramCount = dgrams.len().csize_t
var dgramsBuf = newString(dgramCount * ctx.quiclyCtx.transport_params.max_udp_payload_size) var dgramsBuf = newString(dgramCount * ctx.quiclyCtx.transport_params.max_udp_payload_size)
let sendResult = quicly_send(c, addr dstAddr, addr srcAddr, addr dgrams[0], let sendResult = quicly_send(conns[i], addr dstAddr, addr srcAddr,
addr dgramCount, addr dgramsBuf[0], addr dgrams[0], addr dgramCount,
dgramsBuf.len().csize_t) addr dgramsBuf[0], dgramsBuf.len().csize_t)
case sendResult: case sendResult:
of 0: of 0:
if dgramCount > 0: if dgramCount > 0:
echo &"sending {dgramCount} datagrams" echo &"sending {dgramCount} datagrams"
for i in 0 .. dgramCount - 1: for j in 0 .. dgramCount - 1:
var sockLen = quicly_get_socklen(addr dstAddr.sa) var sockLen = quicly_get_socklen(addr dstAddr.sa)
# TODO: replace asyncdispatch.sendTo with asyncnet.sendTo (Nim 1.4 required) # TODO: replace asyncdispatch.sendTo with asyncnet.sendTo (Nim 1.4 required)
asyncCheck sendTo(ctx.sock.getFd().AsyncFD, dgrams[i].iov_base, asyncCheck sendTo(ctx.sock.getFd().AsyncFD, dgrams[j].iov_base,
dgrams[i].iov_len.int, addr dstAddr.sa, sockLen) dgrams[j].iov_len.int, addr dstAddr.sa, sockLen)
of QUICLY_ERROR_FREE_CONNECTION: of QUICLY_ERROR_FREE_CONNECTION:
ctx.connections.del(ctx.connections.find(c)) let c = ctx.connections[i]
ctx.connections.del(i)
quicly_free(c) quicly_free(c)
else: else:
raise newException(ValueError, &"quicly_send returned {sendResult}") raise newException(ValueError, &"quicly_send returned {sendResult}")