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

rename ReadVarint / WriteVarInt / VarIntLen to Read / Write / Len

Browse Source
This commit is contained in:
Marten Seemann
2021-01-01 11:40:53 +08:00
parent 11c5045065
commit f9226887b4
46 changed files with 298 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http3/client.go
View File

@@ -132,7 +132,7 @@ func (c *client) setupSession() error {
return err
}
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
// send the SETTINGS frame
(&settingsFrame{Datagram: c.opts.EnableDatagram}).Write(buf)
_, err = str.Write(buf.Bytes())
@@ -148,7 +148,7 @@ func (c *client) handleUnidirectionalStreams() {
}
go func() {
streamType, err := quicvarint.ReadVarInt(&byteReaderImpl{str})
streamType, err := quicvarint.Read(&byteReaderImpl{str})
if err != nil {
c.logger.Debugf("reading stream type on stream %d failed: %s", str.StreamID(), err)
return

14
http3/client_test.go
View File

@@ -218,7 +218,7 @@ var _ = Describe("Client", func() {
It("parses the SETTINGS frame", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&settingsFrame{}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -236,7 +236,7 @@ var _ = Describe("Client", func() {
It("ignores streams other than the control stream", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, 1337)
quicvarint.Write(buf, 1337)
str := mockquic.NewMockStream(mockCtrl)
str.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
done := make(chan struct{})
@@ -258,7 +258,7 @@ var _ = Describe("Client", func() {
It("errors when the first frame on the control stream is not a SETTINGS frame", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&dataFrame{}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -282,7 +282,7 @@ var _ = Describe("Client", func() {
It("errors when parsing the frame on the control stream fails", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
b := &bytes.Buffer{}
(&settingsFrame{}).Write(b)
buf.Write(b.Bytes()[:b.Len()-1])
@@ -308,7 +308,7 @@ var _ = Describe("Client", func() {
It("errors when parsing the server opens a push stream", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypePushStream)
quicvarint.Write(buf, streamTypePushStream)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
sess.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
@@ -332,7 +332,7 @@ var _ = Describe("Client", func() {
It("errors when the server advertises datagram support (and we enabled support for it)", func() {
client.opts.EnableDatagram = true
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&settingsFrame{Datagram: true}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -391,7 +391,7 @@ var _ = Describe("Client", func() {
controlStr.EXPECT().Write(gomock.Any()).Do(func(b []byte) {
defer GinkgoRecover()
r := bytes.NewReader(b)
streamType, err := quicvarint.ReadVarInt(r)
streamType, err := quicvarint.Read(r)
Expect(err).ToNot(HaveOccurred())
Expect(streamType).To(BeEquivalentTo(streamTypeControlStream))
close(settingsFrameWritten)

32
http3/frames.go
View File

@@ -32,11 +32,11 @@ func parseNextFrame(b io.Reader) (frame, error) {
if !ok {
br = &byteReaderImpl{b}
}
t, err := quicvarint.ReadVarInt(br)
t, err := quicvarint.Read(br)
if err != nil {
return nil, err
}
l, err := quicvarint.ReadVarInt(br)
l, err := quicvarint.Read(br)
if err != nil {
return nil, err
}
@@ -72,8 +72,8 @@ type dataFrame struct {
}
func (f *dataFrame) Write(b *bytes.Buffer) {
quicvarint.WriteVarInt(b, 0x0)
quicvarint.WriteVarInt(b, f.Length)
quicvarint.Write(b, 0x0)
quicvarint.Write(b, f.Length)
}
type headersFrame struct {
@@ -81,8 +81,8 @@ type headersFrame struct {
}
func (f *headersFrame) Write(b *bytes.Buffer) {
quicvarint.WriteVarInt(b, 0x1)
quicvarint.WriteVarInt(b, f.Length)
quicvarint.Write(b, 0x1)
quicvarint.Write(b, f.Length)
}
const settingDatagram = 0x276
@@ -107,11 +107,11 @@ func parseSettingsFrame(r io.Reader, l uint64) (*settingsFrame, error) {
b := bytes.NewReader(buf)
var readDatagram bool
for b.Len() > 0 {
id, err := quicvarint.ReadVarInt(b)
id, err := quicvarint.Read(b)
if err != nil { // should not happen. We allocated the whole frame already.
return nil, err
}
val, err := quicvarint.ReadVarInt(b)
val, err := quicvarint.Read(b)
if err != nil { // should not happen. We allocated the whole frame already.
return nil, err
}
@@ -140,21 +140,21 @@ func parseSettingsFrame(r io.Reader, l uint64) (*settingsFrame, error) {
}
func (f *settingsFrame) Write(b *bytes.Buffer) {
quicvarint.WriteVarInt(b, 0x4)
quicvarint.Write(b, 0x4)
var l protocol.ByteCount
for id, val := range f.other {
l += quicvarint.VarIntLen(id) + quicvarint.VarIntLen(val)
l += quicvarint.Len(id) + quicvarint.Len(val)
}
if f.Datagram {
l += quicvarint.VarIntLen(settingDatagram) + quicvarint.VarIntLen(1)
l += quicvarint.Len(settingDatagram) + quicvarint.Len(1)
}
quicvarint.WriteVarInt(b, uint64(l))
quicvarint.Write(b, uint64(l))
if f.Datagram {
quicvarint.WriteVarInt(b, settingDatagram)
quicvarint.WriteVarInt(b, 1)
quicvarint.Write(b, settingDatagram)
quicvarint.Write(b, 1)
}
for id, val := range f.other {
quicvarint.WriteVarInt(b, id)
quicvarint.WriteVarInt(b, val)
quicvarint.Write(b, id)
quicvarint.Write(b, val)
}
}

2
http3/frames_test.go
View File

@@ -14,7 +14,7 @@ import (
var _ = Describe("Frames", func() {
appendVarInt := func(b []byte, val uint64) []byte {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, val)
quicvarint.Write(buf, val)
return append(b, buf.Bytes()...)
}

4
http3/server.go
View File

@@ -237,7 +237,7 @@ func (s *Server) handleConn(sess quic.EarlySession) {
return
}
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream) // stream type
quicvarint.Write(buf, streamTypeControlStream) // stream type
(&settingsFrame{Datagram: s.EnableDatagrams}).Write(buf)
str.Write(buf.Bytes())
@@ -283,7 +283,7 @@ func (s *Server) handleUnidirectionalStreams(sess quic.EarlySession) {
}
go func(str quic.ReceiveStream) {
streamType, err := quicvarint.ReadVarInt(&byteReaderImpl{str})
streamType, err := quicvarint.Read(&byteReaderImpl{str})
if err != nil {
s.logger.Debugf("reading stream type on stream %d failed: %s", str.StreamID(), err)
return

12
http3/server_test.go
View File

@@ -195,7 +195,7 @@ var _ = Describe("Server", func() {
It("parses the SETTINGS frame", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&settingsFrame{}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -212,7 +212,7 @@ var _ = Describe("Server", func() {
It("ignores streams other than the control stream", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, 1337)
quicvarint.Write(buf, 1337)
str := mockquic.NewMockStream(mockCtrl)
str.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
done := make(chan struct{})
@@ -233,7 +233,7 @@ var _ = Describe("Server", func() {
It("errors when the first frame on the control stream is not a SETTINGS frame", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&dataFrame{}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -256,7 +256,7 @@ var _ = Describe("Server", func() {
It("errors when parsing the frame on the control stream fails", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
b := &bytes.Buffer{}
(&settingsFrame{}).Write(b)
buf.Write(b.Bytes()[:b.Len()-1])
@@ -281,7 +281,7 @@ var _ = Describe("Server", func() {
It("errors when the client opens a push stream", func() {
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypePushStream)
quicvarint.Write(buf, streamTypePushStream)
(&dataFrame{}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()
@@ -305,7 +305,7 @@ var _ = Describe("Server", func() {
It("errors when the client advertises datagram support (and we enabled support for it)", func() {
s.EnableDatagrams = true
buf := &bytes.Buffer{}
quicvarint.WriteVarInt(buf, streamTypeControlStream)
quicvarint.Write(buf, streamTypeControlStream)
(&settingsFrame{Datagram: true}).Write(buf)
controlStr := mockquic.NewMockStream(mockCtrl)
controlStr.EXPECT().Read(gomock.Any()).DoAndReturn(buf.Read).AnyTimes()