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

fix an error reading n-byte integers

Browse Source
This commit is contained in:
Lucas Clemente
2016-04-11 14:41:21 +02:00
parent f293b525da
commit df96797e9c
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public_header.go
View File

@@ -56,12 +56,20 @@ func ParsePublicHeader(b io.ByteReader) (*PublicHeader, error) {
// Version (optional)
if header.VersionFlag {
var v uint64
v, err = utils.ReadUintN(b, 4)
if err != nil {
var b1, b2, b3, b4 uint8
if b1, err = b.ReadByte(); err != nil {
return nil, err
}
header.QuicVersion = uint32(v)
if b2, err = b.ReadByte(); err != nil {
return nil, err
}
if b3, err = b.ReadByte(); err != nil {
return nil, err
}
if b4, err = b.ReadByte(); err != nil {
return nil, err
}
header.QuicVersion = uint32(b4) + uint32(b3)<<8 + uint32(b2)<<16 + uint32(b1)<<24
}
// Packet number

14
public_header_test.go
View File

@@ -16,7 +16,7 @@ var _ = Describe("Public Header", func() {
Expect(err).ToNot(HaveOccurred())
Expect(publicHeader.VersionFlag).To(BeTrue())
Expect(publicHeader.ResetFlag).To(BeFalse())
Expect(publicHeader.ConnectionID).To(Equal(uint64(0xf61986669b9ffa4c)))
Expect(publicHeader.ConnectionID).To(Equal(uint64(0x4cfa9f9b668619f6)))
Expect(publicHeader.QuicVersion).To(Equal(binary.BigEndian.Uint32([]byte("Q030"))))
Expect(publicHeader.PacketNumber).To(Equal(uint64(1)))
Expect(b.Len()).To(BeZero())
@@ -27,7 +27,7 @@ var _ = Describe("Public Header", func() {
publicHeader, err := ParsePublicHeader(b)
Expect(err).ToNot(HaveOccurred())
Expect(publicHeader.VersionFlag).To(BeFalse())
Expect(publicHeader.ConnectionID).To(Equal(uint64(0x9b9ffa4c)))
Expect(publicHeader.ConnectionID).To(Equal(uint64(0x4cfa9f9b)))
Expect(b.Len()).To(BeZero())
})
@@ -52,12 +52,12 @@ var _ = Describe("Public Header", func() {
b := bytes.NewReader([]byte{0x10, 0xde, 0xca})
publicHeader, err := ParsePublicHeader(b)
Expect(err).ToNot(HaveOccurred())
Expect(publicHeader.PacketNumber).To(Equal(uint64(0xdeca)))
Expect(publicHeader.PacketNumber).To(Equal(uint64(0xcade)))
Expect(b.Len()).To(BeZero())
})
It("accepts 4-byte packet numbers", func() {
b := bytes.NewReader([]byte{0x20, 0xde, 0xca, 0xfb, 0xad})
b := bytes.NewReader([]byte{0x20, 0xad, 0xfb, 0xca, 0xde})
publicHeader, err := ParsePublicHeader(b)
Expect(err).ToNot(HaveOccurred())
Expect(publicHeader.PacketNumber).To(Equal(uint64(0xdecafbad)))
@@ -65,7 +65,7 @@ var _ = Describe("Public Header", func() {
})
It("accepts 6-byte packet numbers", func() {
b := bytes.NewReader([]byte{0x30, 0xde, 0xca, 0xfb, 0xad, 0x42, 0x23})
b := bytes.NewReader([]byte{0x30, 0x23, 0x42, 0xad, 0xfb, 0xca, 0xde})
publicHeader, err := ParsePublicHeader(b)
Expect(err).ToNot(HaveOccurred())
Expect(publicHeader.PacketNumber).To(Equal(uint64(0xdecafbad4223)))
@@ -77,10 +77,10 @@ var _ = Describe("Public Header", func() {
It("writes a sample header", func() {
b := &bytes.Buffer{}
WritePublicHeader(b, &PublicHeader{
ConnectionID: 1,
ConnectionID: 0x4cfa9f9b668619f6,
PacketNumber: 2,
})
Expect(b.Bytes()).To(Equal([]byte{0x2c, 1, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0}))
Expect(b.Bytes()).To(Equal([]byte{0x2c, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 2, 0, 0, 0}))
})
})
})

4
utils/utils.go
View File

@@ -13,7 +13,7 @@ func ReadUintN(b io.ByteReader, length uint8) (uint64, error) {
if err != nil {
return 0, err
}
res = res<<8 + uint64(bt)
res ^= uint64(bt) << (i * 8)
}
return res, nil
}
@@ -59,7 +59,7 @@ func WriteUint64(b *bytes.Buffer, i uint64) {
b.WriteByte(uint8((i >> 32) & 0xff))
b.WriteByte(uint8((i >> 40) & 0xff))
b.WriteByte(uint8((i >> 48) & 0xff))
b.WriteByte(uint8((i >> 56) & 0xff))
b.WriteByte(uint8(i >> 56))
}
// WriteUint32 writes a uint32