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

Rename: header -> packet

This commit is contained in:
Mark Spanbroek 2020-09-23 10:05:10 +02:00 committed by markspanbroek
parent be3074f739
commit afcf424e47
5 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quic/packets.nim
View File

@ -43,9 +43,9 @@ proc readPacket*(datagram: Datagram): Packet =
else:
readLongPacket(datagram)
proc write*(datagram: var Datagram, header: Packet) =
datagram.writeForm(header)
proc write*(datagram: var Datagram, packet: Packet) =
datagram.writeForm(packet)
datagram.writeFixedBit()
if header.form == formLong:
datagram.writeKind(header)
datagram.writeVersion(header)
if packet.form == formLong:
datagram.writeKind(packet)
datagram.writeVersion(packet)

6
quic/packets/length.nim
View File

@ -2,9 +2,9 @@ import packet
{.push raises:[].} # avoid exceptions in this module
proc packetLength*(header: Packet): int =
case header.kind:
proc packetLength*(packet: Packet): int =
case packet.kind:
of packetVersionNegotiation:
return 11 + header.destination.len + header.source.len
return 11 + packet.destination.len + packet.source.len
else:
return 0

24
quic/packets/packet.nim
View File

@ -39,18 +39,18 @@ type
source*: ConnectionId
PacketNumber* = range[0'u64..2'u64^62-1]
proc version*(header: Packet): uint32 =
case header.kind
of packetInitial: header.initial.version
of packet0RTT: header.rtt.version
of packetHandshake: header.handshake.version
of packetRetry: header.retry.version
proc version*(packet: Packet): uint32 =
case packet.kind
of packetInitial: packet.initial.version
of packet0RTT: packet.rtt.version
of packetHandshake: packet.handshake.version
of packetRetry: packet.retry.version
of packetVersionNegotiation: 0
proc `version=`*(header: var Packet, version: uint32) =
case header.kind
of packetInitial: header.initial.version = version
of packet0RTT: header.rtt.version = version
of packetHandshake: header.handshake.version = version
of packetRetry: header.retry.version = version
proc `version=`*(packet: var Packet, version: uint32) =
case packet.kind
of packetInitial: packet.initial.version = version
of packet0RTT: packet.rtt.version = version
of packetHandshake: packet.handshake.version = version
of packetRetry: packet.retry.version = version
of packetVersionNegotiation: discard

16
quic/packets/write.nim
View File

@ -3,22 +3,22 @@ import datagram
import packet
import ../bits
proc writeForm*(datagram: var Datagram, header: Packet) =
datagram[0].bits[0] = Bit(header.form)
proc writeForm*(datagram: var Datagram, packet: Packet) =
datagram[0].bits[0] = Bit(packet.form)
proc writeFixedBit*(datagram: var Datagram) =
datagram[0].bits[1] = 1
proc writeKind*(datagram: var Datagram, header: Packet) =
case header.kind:
proc writeKind*(datagram: var Datagram, packet: Packet) =
case packet.kind:
of packetVersionNegotiation:
discard
else:
datagram[0].bits[2] = header.kind.uint8.bits[6]
datagram[0].bits[3] = header.kind.uint8.bits[7]
datagram[0].bits[2] = packet.kind.uint8.bits[6]
datagram[0].bits[3] = packet.kind.uint8.bits[7]
proc writeVersion*(datagram: var Datagram, header: Packet) =
let bytes = toBytesBE(header.version)
proc writeVersion*(datagram: var Datagram, packet: Packet) =
let bytes = toBytesBE(packet.version)
datagram[1] = bytes[0]
datagram[2] = bytes[1]
datagram[3] = bytes[2]

50
tests/quic/testPackets.nim
View File

@ -55,63 +55,63 @@ suite "long headers":
test "QUIC version is stored in bytes 1..4":
var version = 0xAABBCCDD'u32
var header = readPacket(
var packet = readPacket(
type0 &
@(toBytesBE(version)) &
destination.len.uint8 & destination &
source.len.uint8 & source
)
check header.version == version
check packet.version == version
test "QUIC version can be set":
var header = Packet(form: formLong, kind: packetInitial)
header.version = 0xAABBCCDD'u32
datagram.write(header)
var packet = Packet(form: formLong, kind: packetInitial)
packet.version = 0xAABBCCDD'u32
datagram.write(packet)
check datagram[1..4] == @[0xAA'u8, 0xBB'u8, 0xCC'u8, 0xDD'u8]
test "version negotiation packet is a packet with version 0":
let header = readPacket(type0 & version0 & destination.len.uint8 & destination & source.len.uint8 & source & version1)
check header.kind == packetVersionNegotiation
let packet = readPacket(type0 & version0 & destination.len.uint8 & destination & source.len.uint8 & source & version1)
check packet.kind == packetVersionNegotiation
test "initial packet is a long packet of type 0":
let header = readPacket(type0 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check header.kind == packetInitial
let packet = readPacket(type0 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check packet.kind == packetInitial
test "0-RTT packet is a long packet of type 1":
let header = readPacket(type1 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check header.kind == packet0RTT
let packet = readPacket(type1 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check packet.kind == packet0RTT
test "handshake packet is a long packet of type 2":
let header = readPacket(type2 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check header.kind == packetHandshake
let packet = readPacket(type2 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check packet.kind == packetHandshake
test "retry packet is a long packet of type 3":
let header = readPacket(type3 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check header.kind == packetRetry
let packet = readPacket(type3 & version1 & destination.len.uint8 & destination & source.len.uint8 & source)
check packet.kind == packetRetry
test "long packet type can be set":
var header = Packet(form: formLong, kind: packetHandshake)
datagram.write(header)
var packet = Packet(form: formLong, kind: packetHandshake)
datagram.write(packet)
check datagram[0].bits[2] == 1
check datagram[0].bits[3] == 0
test "destination connection id is encoded from byte 5 onwards":
let id = @[1'u8, 2'u8, 3'u8]
var header = readPacket(type0 & version1 & id.len.uint8 & id & source.len.uint8 & source)
check header.destination == ConnectionId(id)
var packet = readPacket(type0 & version1 & id.len.uint8 & id & source.len.uint8 & source)
check packet.destination == ConnectionId(id)
test "source connection id follows the destination connection id":
var header = readPacket(
var packet = readPacket(
type0 & version1 &
destination.len.uint8 & destination &
source.len.uint8 & source
)
check header.source == ConnectionId(source)
check packet.source == ConnectionId(source)
suite "version negotiation packet":
test "has a fixed length":
let header = readPacket(
let packet = readPacket(
type0 &
version0 &
destination.len.uint8 & destination &
@ -119,7 +119,7 @@ suite "long headers":
version1 &
@[byte('r'), byte('e'), byte('s'), byte('t')]
)
check header.packetLength ==
check packet.packetLength ==
type0.len +
version0.len +
destination.len + 1 +
@ -127,14 +127,14 @@ suite "long headers":
version1.len
test "has a supported version field":
let header = readPacket(
let packet = readPacket(
type0 &
version0 &
destination.len.uint8 & destination &
source.len.uint8 & source &
version1
)
check header.negotiation.supportedVersion == 1'u32
check packet.negotiation.supportedVersion == 1'u32
suite "packet numbers":