vacp2p
/
nim-quic
mirror of https://github.com/vacp2p/nim-quic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename: waitForHandshake() -> handshake()

This commit is contained in:
Mark Spanbroek 2020-11-03 16:45:06 +01:00 committed by markspanbroek
parent 7af5c5376e
commit 80a612ea11
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quic/connection.nim
View File

@ -10,7 +10,7 @@ export newClientConnection
export newServerConnection export newServerConnection
export receive, send export receive, send
export isHandshakeCompleted export isHandshakeCompleted
export waitForHandshake export handshake
export Stream export Stream
export openStream export openStream
export close export close

6
quic/ngtcp2/handshake.nim
View File

@ -1,5 +1,11 @@
import chronos
import ngtcp2 import ngtcp2
import connection import connection
import udp
proc isHandshakeCompleted*(connection: Connection): bool = proc isHandshakeCompleted*(connection: Connection): bool =
ngtcp2_conn_get_handshake_completed(connection.conn).bool ngtcp2_conn_get_handshake_completed(connection.conn).bool
proc handshake*(connection: Connection) {.async.} =
while not connection.isHandshakeCompleted:
await connection.send()

5
quic/ngtcp2/udp.nim
View File

@ -7,7 +7,6 @@ import ../congestion
import connection import connection
import path import path
import errors import errors
import handshake
proc trySend(connection: Connection): Datagram = proc trySend(connection: Connection): Datagram =
var packetInfo: ngtcp2_pkt_info var packetInfo: ngtcp2_pkt_info
@ -36,10 +35,6 @@ proc send*(connection: Connection) {.async.} =
datagram = connection.trySend() datagram = connection.trySend()
await connection.outgoing.put(datagram) await connection.outgoing.put(datagram)
proc waitForHandshake*(connection: Connection) {.async.} =
while not connection.isHandshakeCompleted:
await connection.send()
proc receive*(connection: Connection, datagram: DatagramBuffer, ecn = ecnNonCapable) = proc receive*(connection: Connection, datagram: DatagramBuffer, ecn = ecnNonCapable) =
var packetInfo: ngtcp2_pkt_info var packetInfo: ngtcp2_pkt_info
packetInfo.ecn = ecn.uint32 packetInfo.ecn = ecn.uint32

4
tests/helpers/connections.nim
View File

@ -10,13 +10,13 @@ proc sendLoop(source, destination: Connection) {.async.} =
proc performHandshake*: Future[tuple[client, server: Connection]] {.async.} = proc performHandshake*: Future[tuple[client, server: Connection]] {.async.} =
let client = newClientConnection(zeroAddress, zeroAddress) let client = newClientConnection(zeroAddress, zeroAddress)
let clientHandshake = client.waitForHandshake() let clientHandshake = client.handshake()
let datagram = await client.outgoing.get() let datagram = await client.outgoing.get()
let server = newServerConnection(zeroAddress, zeroAddress, datagram.data) let server = newServerConnection(zeroAddress, zeroAddress, datagram.data)
server.receive(datagram) server.receive(datagram)
let serverHandshake = server.waitForHandshake() let serverHandshake = server.handshake()
let clientLoop = sendLoop(client, server) let clientLoop = sendLoop(client, server)
let serverLoop = sendLoop(server, client) let serverLoop = sendLoop(server, client)