Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

http3: rename Server.QuicConfig to Server.QUICConfig #4384

Merged
merged 1 commit into from
Mar 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func main() {
server := http3.Server{
Handler: handler,
Addr: bCap,
QuicConfig: &quic.Config{
QUICConfig: &quic.Config{
Tracer: qlog.DefaultTracer,
},
}
Expand Down
19 changes: 9 additions & 10 deletions http3/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,19 +172,18 @@ type Server struct {
// set for ListenAndServe and Serve methods.
TLSConfig *tls.Config

// QuicConfig provides the parameters for QUIC connection created with
// Serve. If nil, it uses reasonable default values.
// QUICConfig provides the parameters for QUIC connection created with Serve.
// If nil, it uses reasonable default values.
//
// Configured versions are also used in Alt-Svc response header set with
// SetQUICHeaders.
QuicConfig *quic.Config
// Configured versions are also used in Alt-Svc response header set with SetQUICHeaders.
QUICConfig *quic.Config

// Handler is the HTTP request handler to use. If not set, defaults to
// http.NotFound.
Handler http.Handler

// EnableDatagrams enables support for HTTP/3 datagrams.
// If set to true, QuicConfig.EnableDatagram will be set.
// If set to true, QUICConfig.EnableDatagram will be set.
// See https://datatracker.ietf.org/doc/html/rfc9297.
EnableDatagrams bool

Expand Down Expand Up @@ -311,11 +310,11 @@ func (s *Server) serveConn(tlsConf *tls.Config, conn net.PacketConn) error {
}

baseConf := ConfigureTLSConfig(tlsConf)
quicConf := s.QuicConfig
quicConf := s.QUICConfig
if quicConf == nil {
quicConf = &quic.Config{Allow0RTT: true}
} else {
quicConf = s.QuicConfig.Clone()
quicConf = s.QUICConfig.Clone()
}
if s.EnableDatagrams {
quicConf.EnableDatagrams = true
Expand Down Expand Up @@ -360,8 +359,8 @@ func (s *Server) generateAltSvcHeader() {

// This code assumes that we will use protocol.SupportedVersions if no quic.Config is passed.
supportedVersions := protocol.SupportedVersions
if s.QuicConfig != nil && len(s.QuicConfig.Versions) > 0 {
supportedVersions = s.QuicConfig.Versions
if s.QUICConfig != nil && len(s.QUICConfig.Versions) > 0 {
supportedVersions = s.QUICConfig.Versions
}

// keep track of which have been seen so we don't yield duplicate values
Expand Down
8 changes: 4 additions & 4 deletions http3/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ var _ = Describe("Server", func() {

Context("setting http headers", func() {
BeforeEach(func() {
s.QuicConfig = &quic.Config{Versions: []protocol.Version{protocol.Version1}}
s.QUICConfig = &quic.Config{Versions: []protocol.Version{protocol.Version1}}
})

var ln1 QUICEarlyListener
Expand Down Expand Up @@ -945,7 +945,7 @@ var _ = Describe("Server", func() {
})

It("works if the quic.Config sets QUIC versions", func() {
s.QuicConfig.Versions = []quic.Version{quic.Version1, quic.Version2}
s.QUICConfig.Versions = []quic.Version{quic.Version1, quic.Version2}
addListener(":443", &ln1)
checkSetHeaders(Equal(http.Header{"Alt-Svc": {`h3=":443"; ma=2592000`}}))
removeListener(&ln1)
Expand Down Expand Up @@ -984,7 +984,7 @@ var _ = Describe("Server", func() {
})

It("doesn't duplicate Alt-Svc values", func() {
s.QuicConfig.Versions = []quic.Version{quic.Version1, quic.Version1}
s.QUICConfig.Versions = []quic.Version{quic.Version1, quic.Version1}
addListener(":443", &ln1)
checkSetHeaders(Equal(http.Header{"Alt-Svc": {`h3=":443"; ma=2592000`}}))
removeListener(&ln1)
Expand Down Expand Up @@ -1314,7 +1314,7 @@ var _ = Describe("Server", func() {
receivedConf = config
return nil, errors.New("listen err")
}
s.QuicConfig = conf
s.QUICConfig = conf
Expect(s.ListenAndServe()).To(HaveOccurred())
Expect(receivedConf).To(Equal(conf))
})
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/self/hotswap_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ var _ = Describe("HTTP3 Server hotswap test", func() {

server1 = &http3.Server{
Handler: mux1,
QuicConfig: getQuicConfig(nil),
QUICConfig: getQuicConfig(nil),
}
server2 = &http3.Server{
Handler: mux2,
QuicConfig: getQuicConfig(nil),
QUICConfig: getQuicConfig(nil),
}

tlsConf := http3.ConfigureTLSConfig(getTLSConfig())
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/self/http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ var _ = Describe("HTTP tests", func() {
server = &http3.Server{
Handler: mux,
TLSConfig: getTLSConfig(),
QuicConfig: getQuicConfig(&quic.Config{Allow0RTT: true}),
QUICConfig: getQuicConfig(&quic.Config{Allow0RTT: true}),
}

addr, err := net.ResolveUDPAddr("udp", "0.0.0.0:0")
Expand Down
2 changes: 1 addition & 1 deletion interop/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func runHTTP3Server(quicConf *quic.Config) error {
server := http3.Server{
Addr: ":443",
TLSConfig: tlsConf,
QuicConfig: quicConf,
QUICConfig: quicConf,
}
http.DefaultServeMux.Handle("/", http.FileServer(http.Dir("/www")))
return server.ListenAndServe()
Expand Down
Loading