From 99d4e36a56c1f91accf499a545741ecf54862661 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 5 Aug 2016 00:11:40 +0700 Subject: [PATCH] also make ParsePublicHeader public --- public_header.go | 4 ++-- public_header_test.go | 16 ++++++++-------- server.go | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public_header.go b/public_header.go index dd384297..900a4b73 100644 --- a/public_header.go +++ b/public_header.go @@ -98,8 +98,8 @@ func (h *PublicHeader) WritePublicHeader(b *bytes.Buffer, version protocol.Versi return nil } -// parsePublicHeader parses a QUIC packet's public header -func parsePublicHeader(b io.ByteReader) (*PublicHeader, error) { +// ParsePublicHeader parses a QUIC packet's public header +func ParsePublicHeader(b io.ByteReader) (*PublicHeader, error) { header := &PublicHeader{} // First byte diff --git a/public_header_test.go b/public_header_test.go index 24e00285..90470408 100644 --- a/public_header_test.go +++ b/public_header_test.go @@ -12,7 +12,7 @@ var _ = Describe("Public Header", func() { Context("when parsing", func() { It("accepts a sample client header", func() { b := bytes.NewReader([]byte{0x09, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0x51, 0x30, 0x33, 0x34, 0x01}) - hdr, err := parsePublicHeader(b) + hdr, err := ParsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.VersionFlag).To(BeTrue()) Expect(hdr.ResetFlag).To(BeFalse()) @@ -24,19 +24,19 @@ var _ = Describe("Public Header", func() { It("does not accept 0-byte connection ID", func() { b := bytes.NewReader([]byte{0x00, 0x01}) - _, err := parsePublicHeader(b) + _, err := ParsePublicHeader(b) Expect(err).To(MatchError(errReceivedTruncatedConnectionID)) }) It("rejects 0 as a connection ID", func() { b := bytes.NewReader([]byte{0x09, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x51, 0x30, 0x33, 0x30, 0x01}) - _, err := parsePublicHeader(b) + _, err := ParsePublicHeader(b) Expect(err).To(MatchError(errInvalidConnectionID)) }) It("accepts 1-byte packet numbers", func() { b := bytes.NewReader([]byte{0x08, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xde}) - hdr, err := parsePublicHeader(b) + hdr, err := ParsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0xde))) Expect(b.Len()).To(BeZero()) @@ -44,7 +44,7 @@ var _ = Describe("Public Header", func() { It("accepts 2-byte packet numbers", func() { b := bytes.NewReader([]byte{0x18, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xde, 0xca}) - hdr, err := parsePublicHeader(b) + hdr, err := ParsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0xcade))) Expect(b.Len()).To(BeZero()) @@ -52,7 +52,7 @@ var _ = Describe("Public Header", func() { It("accepts 4-byte packet numbers", func() { b := bytes.NewReader([]byte{0x28, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0xad, 0xfb, 0xca, 0xde}) - hdr, err := parsePublicHeader(b) + hdr, err := ParsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0xdecafbad))) Expect(b.Len()).To(BeZero()) @@ -60,7 +60,7 @@ var _ = Describe("Public Header", func() { It("accepts 6-byte packet numbers", func() { b := bytes.NewReader([]byte{0x38, 0xf6, 0x19, 0x86, 0x66, 0x9b, 0x9f, 0xfa, 0x4c, 0x23, 0x42, 0xad, 0xfb, 0xca, 0xde}) - hdr, err := parsePublicHeader(b) + hdr, err := ParsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.PacketNumber).To(Equal(protocol.PacketNumber(0xdecafbad4223))) Expect(b.Len()).To(BeZero()) @@ -71,7 +71,7 @@ var _ = Describe("Public Header", func() { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 0x01, }) - _, err := parsePublicHeader(b) + _, err := ParsePublicHeader(b) Expect(err).To(MatchError("diversification nonces should only be sent by servers")) }) }) diff --git a/server.go b/server.go index f4702e72..b272112c 100644 --- a/server.go +++ b/server.go @@ -132,7 +132,7 @@ func (s *Server) handlePacket(conn *net.UDPConn, remoteAddr *net.UDPAddr, packet r := bytes.NewReader(packet) - hdr, err := parsePublicHeader(r) + hdr, err := ParsePublicHeader(r) if err != nil { return qerr.Error(qerr.InvalidPacketHeader, err.Error()) }