gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1319 from lucas-clemente/fix-1307

Browse Source 
use different source and destination connection IDs
This commit is contained in:
Marten Seemann
2018-04-23 17:29:45 +09:00
committed by GitHub
parent b1de5df2f8 fae32101a0
commit 0e58a679d6
12 changed files with 482 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/wire/ietf_header.go
View File

@@ -131,11 +131,8 @@ func (h *Header) writeHeader(b *bytes.Buffer) error {
// TODO: add support for the key phase
func (h *Header) writeLongHeader(b *bytes.Buffer) error {
if !h.DestConnectionID.Equal(h.SrcConnectionID) {
return errors.New("Header: can't write a header with different source and destination connection ID")
}
if h.SrcConnectionID.Len() != 8 {
return fmt.Errorf("Header: source connection ID must be 8 bytes, is %d", h.SrcConnectionID.Len())
if h.SrcConnectionID.Len() != protocol.ConnectionIDLen {
return fmt.Errorf("Header: source connection ID must be %d bytes, is %d", protocol.ConnectionIDLen, h.SrcConnectionID.Len())
}
b.WriteByte(byte(0x80 | h.Type))
utils.BigEndian.WriteUint32(b, uint32(h.Version))
@@ -220,7 +217,7 @@ func encodeSingleConnIDLen(id protocol.ConnectionID) (byte, error) {
return 0, nil
}
if len < 4 || len > 18 {
return 0, errors.New("invalid connection ID length")
return 0, fmt.Errorf("invalid connection ID length: %d bytes", len)
}
return byte(len - 3), nil
}