mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

make it possible to set settings unknown to the http3 package

Browse source
This commit is contained in:
Marten Seemann 2022-03-22 10:22:15 +01:00
parent 57461e01b5
commit a54816867f
8 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
http3/client.go
View file

@ -42,6 +42,7 @@ type roundTripperOpts struct {
DisableCompression bool
EnableDatagram bool
MaxHeaderBytes int64
AdditionalSettings map[uint64]uint64
}
// client is a HTTP3 client doing requests
@ -130,7 +131,7 @@ func (c *client) setupConn() error {
buf := &bytes.Buffer{}
quicvarint.Write(buf, streamTypeControlStream)
// send the SETTINGS frame
(&settingsFrame{Datagram: c.opts.EnableDatagram}).Write(buf)
(&settingsFrame{Datagram: c.opts.EnableDatagram, Other: c.opts.AdditionalSettings}).Write(buf)
_, err = str.Write(buf.Bytes())
return err
}

2
http3/client_test.go
View file

@ -261,7 +261,7 @@ var _ = Describe("Client", func() {
})
}
It("resets streams other than the control stream and the QPACK streams", func() {
It("resets streams Other than the control stream and the QPACK streams", func() {
buf := &bytes.Buffer{}
quicvarint.Write(buf, 1337)
str := mockquic.NewMockStream(mockCtrl)

14
http3/frames.go
View file

@ -70,7 +70,7 @@ const settingDatagram = 0xffd277
type settingsFrame struct {
Datagram bool
other map[uint64]uint64 // all settings that we don't explicitly recognize
Other map[uint64]uint64 // all settings that we don't explicitly recognize
}
func parseSettingsFrame(r io.Reader, l uint64) (*settingsFrame, error) {
@ -108,13 +108,13 @@ func parseSettingsFrame(r io.Reader, l uint64) (*settingsFrame, error) {
}
frame.Datagram = val == 1
default:
if _, ok := frame.other[id]; ok {
if _, ok := frame.Other[id]; ok {
return nil, fmt.Errorf("duplicate setting: %d", id)
}
if frame.other == nil {
frame.other = make(map[uint64]uint64)
if frame.Other == nil {
frame.Other = make(map[uint64]uint64)
}
frame.other[id] = val
frame.Other[id] = val
}
}
return frame, nil
@ -123,7 +123,7 @@ func parseSettingsFrame(r io.Reader, l uint64) (*settingsFrame, error) {
func (f *settingsFrame) Write(b *bytes.Buffer) {
quicvarint.Write(b, 0x4)
var l protocol.ByteCount
for id, val := range f.other {
for id, val := range f.Other {
l += quicvarint.Len(id) + quicvarint.Len(val)
}
if f.Datagram {
@ -134,7 +134,7 @@ func (f *settingsFrame) Write(b *bytes.Buffer) {
quicvarint.Write(b, settingDatagram)
quicvarint.Write(b, 1)
}
for id, val := range f.other {
for id, val := range f.Other {
quicvarint.Write(b, id)
quicvarint.Write(b, val)
}

8
http3/frames_test.go
View file

@ -85,8 +85,8 @@ var _ = Describe("Frames", func() {
Expect(err).ToNot(HaveOccurred())
Expect(frame).To(BeAssignableToTypeOf(&settingsFrame{}))
sf := frame.(*settingsFrame)
Expect(sf.other).To(HaveKeyWithValue(uint64(13), uint64(37)))
Expect(sf.other).To(HaveKeyWithValue(uint64(0xdead), uint64(0xbeef)))
Expect(sf.Other).To(HaveKeyWithValue(uint64(13), uint64(37)))
Expect(sf.Other).To(HaveKeyWithValue(uint64(0xdead), uint64(0xbeef)))
})
It("rejects duplicate settings", func() {
@ -102,7 +102,7 @@ var _ = Describe("Frames", func() {
})
It("writes", func() {
sf := &settingsFrame{other: map[uint64]uint64{
sf := &settingsFrame{Other: map[uint64]uint64{
1: 2,
99: 999,
13: 37,
@ -115,7 +115,7 @@ var _ = Describe("Frames", func() {
})
It("errors on EOF", func() {
sf := &settingsFrame{other: map[uint64]uint64{
sf := &settingsFrame{Other: map[uint64]uint64{
13: 37,
0xdeadbeef: 0xdecafbad,
}}

2
http3/request_test.go
View file

@ -64,7 +64,7 @@ var _ = Describe("Request", func() {
}))
})
It("handles other headers", func() {
It("handles Other headers", func() {
headers := []qpack.HeaderField{
{Name: ":path", Value: "/foo"},
{Name: ":authority", Value: "quic.clemente.io"},

4
http3/roundtrip.go
View file

@ -47,6 +47,10 @@ type RoundTripper struct {
// See https://www.ietf.org/archive/id/draft-schinazi-masque-h3-datagram-02.html.
EnableDatagrams bool
// Additional HTTP/3 settings.
// It is invalid to specify any settings defined by the HTTP/3 draft and the datagram draft.
AdditionalSettings map[uint64]uint64
// Dial specifies an optional dial function for creating QUIC
// connections for requests.
// If Dial is nil, quic.DialAddrEarlyContext will be used.

9
http3/server.go
View file

@ -140,9 +140,14 @@ type Server struct {
// a port different from the port the Server is listening on.
Port int
// Additional HTTP/3 settings.
// It is invalid to specify any settings defined by the HTTP/3 draft and the datagram draft.
AdditionalSettings map[uint64]uint64
mutex sync.RWMutex
listeners map[*quic.EarlyListener]listenerInfo
closed utils.AtomicBool
closed utils.AtomicBool
altSvcHeader string
@ -345,7 +350,7 @@ func (s *Server) handleConn(conn quic.EarlyConnection) {
}
buf := &bytes.Buffer{}
quicvarint.Write(buf, streamTypeControlStream) // stream type
(&settingsFrame{Datagram: s.EnableDatagrams}).Write(buf)
(&settingsFrame{Datagram: s.EnableDatagrams, Other: s.AdditionalSettings}).Write(buf)
str.Write(buf.Bytes())
go s.handleUnidirectionalStreams(conn)

2
http3/server_test.go
View file

@ -296,7 +296,7 @@ var _ = Describe("Server", func() {
})
}
It("reset streams other than the control stream and the QPACK streams", func() {
It("reset streams Other than the control stream and the QPACK streams", func() {
buf := &bytes.Buffer{}
quicvarint.Write(buf, 1337)
str := mockquic.NewMockStream(mockCtrl)