diff --git a/public_header.go b/public_header.go index f4600b81..cd3d07a8 100644 --- a/public_header.go +++ b/public_header.go @@ -83,8 +83,8 @@ func (h *publicHeader) WritePublicHeader(b *bytes.Buffer) error { 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 8743dbd0..01ba1488 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, 0x30, 0x01}) - hdr, err := ParsePublicHeader(b) + hdr, err := parsePublicHeader(b) Expect(err).ToNot(HaveOccurred()) Expect(hdr.VersionFlag).To(BeTrue()) Expect(hdr.ResetFlag).To(BeFalse()) @@ -24,21 +24,21 @@ 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(HaveOccurred()) Expect(err).To(Equal(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(HaveOccurred()) Expect(err).To(Equal(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()) @@ -46,7 +46,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()) @@ -54,7 +54,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()) @@ -62,7 +62,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()) @@ -73,7 +73,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 26be1d61..d25bca65 100644 --- a/server.go +++ b/server.go @@ -97,7 +97,7 @@ func (s *Server) handlePacket(conn *net.UDPConn, remoteAddr *net.UDPAddr, packet r := bytes.NewReader(packet) // ToDo: check packet size and send errorcodes.QUIC_PACKET_TOO_LARGE if packet is too large - hdr, err := ParsePublicHeader(r) + hdr, err := parsePublicHeader(r) if err != nil { // ToDo: send errorcodes.QUIC_INVALID_PACKET_HEADER return err