mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

make packetPacker use in-place encryption

Browse source 
ref #217
This commit is contained in:
Lucas Clemente 2016-07-26 15:16:23 +02:00
parent d5255a4075
commit 90aa8cfa95
1 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
packet_packer.go
View file

@ -110,11 +110,15 @@ func (p *packetPacker) packPacket(stopWaitingFrame *frames.StopWaitingFrame, con
}
}
payload, err := p.getPayload(payloadFrames, currentPacketNumber)
if err != nil {
raw := make([]byte, 0, protocol.MaxPacketSize)
buffer := bytes.NewBuffer(raw)
if responsePublicHeader.WritePublicHeader(buffer, p.version) != nil {
return nil, err
}
payloadStartIndex := buffer.Len()
// set entropy bit in Private Header, for QUIC version < 34
var entropyBit bool
if p.version < protocol.Version34 {
@ -123,46 +127,33 @@ func (p *packetPacker) packPacket(stopWaitingFrame *frames.StopWaitingFrame, con
return nil, err
}
if entropyBit {
payload[0] = 1
buffer.WriteByte(1)
} else {
buffer.WriteByte(0)
}
}
var raw bytes.Buffer
if err := responsePublicHeader.WritePublicHeader(&raw, p.version); err != nil {
return nil, err
for _, frame := range payloadFrames {
frame.Write(buffer, p.version)
}
ciphertext := p.cryptoSetup.Seal(nil, payload, currentPacketNumber, raw.Bytes())
raw.Write(ciphertext)
if protocol.ByteCount(raw.Len()) > protocol.MaxPacketSize {
if protocol.ByteCount(buffer.Len()+12) > protocol.MaxPacketSize {
return nil, errors.New("PacketPacker BUG: packet too large")
}
raw = raw[0:buffer.Len()]
p.cryptoSetup.Seal(raw[payloadStartIndex:payloadStartIndex], raw[payloadStartIndex:], currentPacketNumber, raw[:payloadStartIndex])
raw = raw[0 : buffer.Len()+12]
p.lastPacketNumber++
return &packedPacket{
number: currentPacketNumber,
entropyBit: entropyBit,
raw: raw.Bytes(),
raw: raw,
frames: payloadFrames,
}, nil
}
func (p *packetPacker) getPayload(frames []frames.Frame, currentPacketNumber protocol.PacketNumber) ([]byte, error) {
var payload bytes.Buffer
// reserve 1 byte for the Private Header, for QUIC Version < 34
// the entropy bit is set in sendPayload
if p.version < protocol.Version34 {
payload.WriteByte(0)
}
for _, frame := range frames {
frame.Write(&payload, p.version)
}
return payload.Bytes(), nil
}
func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFrame, publicHeaderLength protocol.ByteCount) ([]frames.Frame, error) {
var payloadLength protocol.ByteCount
var payloadFrames []frames.Frame