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

Convert 'source' to a field of PacketHeader object

This commit is contained in:
Mark Spanbroek 2020-09-21 16:40:36 +02:00 committed by markspanbroek
parent 7476645b51
commit 3bea5a879e
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
quic/packets.nim
View File

@ -25,6 +25,7 @@ type
of packetVersionNegotiation:
discard
destination*: ConnectionId
source*: ConnectionId
bytes: seq[byte]
PacketNumber* = range[0'u64..2'u64^62-1]
@ -84,6 +85,15 @@ proc findDestination(datagram: seq[byte]): Slice[int] =
proc readDestination*(datagram: seq[byte]): ConnectionId =
result = ConnectionId(datagram[datagram.findDestination()])
proc findSource(datagram: seq[byte]): Slice[int] =
let destinationEnd = datagram.findDestination().b + 1
let start = destinationEnd + 1
let length = datagram[destinationEnd].int
result = start..<start+length
proc readSource(datagram: seq[byte]): ConnectionId =
result = ConnectionId(datagram[datagram.findSource()])
proc newPacketHeader*(datagram: seq[byte]): PacketHeader =
let form = datagram.readForm()
datagram.readFixedBit()
@ -93,12 +103,13 @@ proc newPacketHeader*(datagram: seq[byte]): PacketHeader =
else:
let kind = datagram.readKind()
let destination = datagram.readDestination()
let source = datagram.readSource()
case kind
of packetVersionNegotiation:
result = PacketHeader(form: form, kind: kind, destination: destination, bytes: datagram)
result = PacketHeader(form: form, kind: kind, destination: destination, source: source, bytes: datagram)
else:
let version = datagram.readVersion()
result = PacketHeader(form: form, kind:kind, version: version, destination: destination, bytes: datagram)
result = PacketHeader(form: form, kind:kind, version: version, destination: destination, source: source, bytes: datagram)
proc newShortPacketHeader*(): PacketHeader =
PacketHeader(form: formShort)
@ -122,9 +133,6 @@ proc sourceSlice(header: PacketHeader): Slice[int] =
let length = header.bytes[destinationEnd].int
result = start..<start+length
proc source*(header: PacketHeader): ConnectionId =
result = ConnectionId(header.bytes[header.sourceSlice])
proc supportedVersionSlice(header: PacketHeader): Slice[int] =
let start = header.sourceSlice().b + 1
result = start..<start+4