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

rename PublicHeader.WritePublicHeader to PublicHeader.Write

Browse Source
This commit is contained in:
Marten Seemann
2016-11-06 22:34:16 +07:00
parent 877f62505f
commit 0d6356d9d8
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integrationtests/proxy/udp_proxy_test.go
View File

@@ -26,7 +26,7 @@ var _ = Describe("UDP Proxy", func() {
ConnectionID: 1337, ConnectionID: 1337,
TruncateConnectionID: false, TruncateConnectionID: false,
} }
hdr.WritePublicHeader(b, protocol.Version34) hdr.Write(b, protocol.Version34)
raw := b.Bytes() raw := b.Bytes()
raw = append(raw, payload...) raw = append(raw, payload...)
return raw return raw

2
packet_packer.go
View File

@@ -113,7 +113,7 @@ func (p *packetPacker) packPacket(stopWaitingFrame *frames.StopWaitingFrame, con
raw := getPacketBuffer() raw := getPacketBuffer()
buffer := bytes.NewBuffer(raw) buffer := bytes.NewBuffer(raw)
if err = responsePublicHeader.WritePublicHeader(buffer, p.version); err != nil { if err = responsePublicHeader.Write(buffer, p.version); err != nil {
return nil, err return nil, err
} }

4
public_header.go
View File

@@ -31,8 +31,8 @@ type PublicHeader struct {
DiversificationNonce []byte DiversificationNonce []byte
} }
// WritePublicHeader writes a public header // Write writes a public header
func (h *PublicHeader) WritePublicHeader(b *bytes.Buffer, version protocol.VersionNumber) error { func (h *PublicHeader) Write(b *bytes.Buffer, version protocol.VersionNumber) error {
publicFlagByte := uint8(0x00) publicFlagByte := uint8(0x00)
if h.VersionFlag && h.ResetFlag { if h.VersionFlag && h.ResetFlag {
return errResetAndVersionFlagSet return errResetAndVersionFlagSet

24
public_header_test.go
View File

@@ -84,7 +84,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 2, PacketNumber: 2,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
} }
hdr.WritePublicHeader(b, protocol.Version35) hdr.Write(b, protocol.Version35)
Expect(b.Bytes()).To(Equal([]byte{0x38, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 2, 0, 0, 0, 0, 0})) Expect(b.Bytes()).To(Equal([]byte{0x38, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 2, 0, 0, 0, 0, 0}))
}) })
@@ -96,7 +96,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 2, PacketNumber: 2,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
} }
hdr.WritePublicHeader(b, protocol.VersionWhatever) hdr.Write(b, protocol.VersionWhatever)
// must be the first assertion // must be the first assertion
Expect(b.Len()).To(Equal(1 + 8)) // 1 FlagByte + 8 ConnectionID Expect(b.Len()).To(Equal(1 + 8)) // 1 FlagByte + 8 ConnectionID
firstByte, _ := b.ReadByte() firstByte, _ := b.ReadByte()
@@ -111,7 +111,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 2, PacketNumber: 2,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
} }
hdr.WritePublicHeader(b, protocol.VersionWhatever) hdr.Write(b, protocol.VersionWhatever)
// must be the first assertion // must be the first assertion
Expect(b.Len()).To(Equal(1 + 8)) // 1 FlagByte + 8 ConnectionID Expect(b.Len()).To(Equal(1 + 8)) // 1 FlagByte + 8 ConnectionID
firstByte, _ := b.ReadByte() firstByte, _ := b.ReadByte()
@@ -127,7 +127,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 2, PacketNumber: 2,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).To(MatchError(errResetAndVersionFlagSet)) Expect(err).To(MatchError(errResetAndVersionFlagSet))
}) })
@@ -139,7 +139,7 @@ var _ = Describe("Public Header", func() {
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
PacketNumber: 1, PacketNumber: 1,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0})) Expect(b.Bytes()).To(Equal([]byte{0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0}))
}) })
@@ -151,7 +151,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 1, PacketNumber: 1,
PacketNumberLen: protocol.PacketNumberLen1, PacketNumberLen: protocol.PacketNumberLen1,
} }
err := hdr.WritePublicHeader(b, protocol.Version35) err := hdr.Write(b, protocol.Version35)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x08, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0x01})) Expect(b.Bytes()).To(Equal([]byte{0x08, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0x01}))
}) })
@@ -164,7 +164,7 @@ var _ = Describe("Public Header", func() {
PacketNumberLen: protocol.PacketNumberLen1, PacketNumberLen: protocol.PacketNumberLen1,
DiversificationNonce: bytes.Repeat([]byte{1}, 32), DiversificationNonce: bytes.Repeat([]byte{1}, 32),
} }
err := hdr.WritePublicHeader(b, protocol.Version35) err := hdr.Write(b, protocol.Version35)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{ Expect(b.Bytes()).To(Equal([]byte{
0x0c, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0x0c, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c,
@@ -247,7 +247,7 @@ var _ = Describe("Public Header", func() {
ConnectionID: 0x4cfa9f9b668619f6, ConnectionID: 0x4cfa9f9b668619f6,
PacketNumber: 0xDECAFBAD, PacketNumber: 0xDECAFBAD,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).To(MatchError(errPacketNumberLenNotSet)) Expect(err).To(MatchError(errPacketNumberLenNotSet))
}) })
@@ -258,7 +258,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 0xDECAFBAD, PacketNumber: 0xDECAFBAD,
PacketNumberLen: protocol.PacketNumberLen1, PacketNumberLen: protocol.PacketNumberLen1,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x08, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD})) Expect(b.Bytes()).To(Equal([]byte{0x08, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD}))
}) })
@@ -270,7 +270,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 0xDECAFBAD, PacketNumber: 0xDECAFBAD,
PacketNumberLen: protocol.PacketNumberLen2, PacketNumberLen: protocol.PacketNumberLen2,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x18, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB})) Expect(b.Bytes()).To(Equal([]byte{0x18, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB}))
}) })
@@ -282,7 +282,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 0x13DECAFBAD, PacketNumber: 0x13DECAFBAD,
PacketNumberLen: protocol.PacketNumberLen4, PacketNumberLen: protocol.PacketNumberLen4,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x28, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB, 0xCA, 0xDE})) Expect(b.Bytes()).To(Equal([]byte{0x28, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB, 0xCA, 0xDE}))
}) })
@@ -294,7 +294,7 @@ var _ = Describe("Public Header", func() {
PacketNumber: 0xBE1337DECAFBAD, PacketNumber: 0xBE1337DECAFBAD,
PacketNumberLen: protocol.PacketNumberLen6, PacketNumberLen: protocol.PacketNumberLen6,
} }
err := hdr.WritePublicHeader(b, protocol.VersionWhatever) err := hdr.Write(b, protocol.VersionWhatever)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(b.Bytes()).To(Equal([]byte{0x38, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB, 0xCA, 0xDE, 0x37, 0x13})) Expect(b.Bytes()).To(Equal([]byte{0x38, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xAD, 0xFB, 0xCA, 0xDE, 0x37, 0x13}))
}) })

2
server.go
View File

@@ -196,7 +196,7 @@ func composeVersionNegotiation(connectionID protocol.ConnectionID) []byte {
PacketNumber: 1, PacketNumber: 1,
VersionFlag: true, VersionFlag: true,
} }
err := responsePublicHeader.WritePublicHeader(fullReply, protocol.Version35) err := responsePublicHeader.Write(fullReply, protocol.Version35)
if err != nil { if err != nil {
utils.Errorf("error composing version negotiation packet: %s", err.Error()) utils.Errorf("error composing version negotiation packet: %s", err.Error())
} }