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

move the DisableVersionNegotiationPackets flag to the Transport (#4047)

Browse source 
* move the DisableVersionNegotiationPackets flag to the Transport

* add an integration test for DisableVersionNegotiationPackets
This commit is contained in:
Marten Seemann 2023-08-31 13:33:40 +07:00 • committed by GitHub
parent 2797f85fc0
commit d7334c16e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 112 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

47
transport.go
View file

@ -57,6 +57,11 @@ type Transport struct {
// See section 10.3 of RFC 9000 for details.
StatelessResetKey *StatelessResetKey
// DisableVersionNegotiationPackets disables the sending of Version Negotiation packets.
// This can be useful if version information is exchanged out-of-band.
// It has no effect for clients.
DisableVersionNegotiationPackets bool
// A Tracer traces events that don't belong to a single QUIC connection.
Tracer logging.Tracer
@ -95,28 +100,10 @@ type Transport struct {
// There can only be a single listener on any net.PacketConn.
// Listen may only be called again after the current Listener was closed.
func (t *Transport) Listen(tlsConf *tls.Config, conf *Config) (*Listener, error) {
if tlsConf == nil {
return nil, errors.New("quic: tls.Config not set")
}
if err := validateConfig(conf); err != nil {
return nil, err
}
t.mutex.Lock()
defer t.mutex.Unlock()
if t.server != nil {
return nil, errListenerAlreadySet
}
conf = populateServerConfig(conf)
if err := t.init(false); err != nil {
return nil, err
}
s, err := newServer(t.conn, t.handlerMap, t.connIDGenerator, tlsConf, conf, t.Tracer, t.closeServer, false)
s, err := t.createServer(tlsConf, conf, false)
if err != nil {
return nil, err
}
t.server = s
return &Listener{baseServer: s}, nil
}
@ -124,6 +111,14 @@ func (t *Transport) Listen(tlsConf *tls.Config, conf *Config) (*Listener, error)
// There can only be a single listener on any net.PacketConn.
// Listen may only be called again after the current Listener was closed.
func (t *Transport) ListenEarly(tlsConf *tls.Config, conf *Config) (*EarlyListener, error) {
s, err := t.createServer(tlsConf, conf, true)
if err != nil {
return nil, err
}
return &EarlyListener{baseServer: s}, nil
}
func (t *Transport) createServer(tlsConf *tls.Config, conf *Config, allow0RTT bool) (*baseServer, error) {
if tlsConf == nil {
return nil, errors.New("quic: tls.Config not set")
}
@ -141,12 +136,22 @@ func (t *Transport) ListenEarly(tlsConf *tls.Config, conf *Config) (*EarlyListen
if err := t.init(false); err != nil {
return nil, err
}
s, err := newServer(t.conn, t.handlerMap, t.connIDGenerator, tlsConf, conf, t.Tracer, t.closeServer, true)
s, err := newServer(
t.conn,
t.handlerMap,
t.connIDGenerator,
tlsConf,
conf,
t.Tracer,
t.closeServer,
t.DisableVersionNegotiationPackets,
allow0RTT,
)
if err != nil {
return nil, err
}
t.server = s
return &EarlyListener{baseServer: s}, nil
return s, nil
}
// Dial dials a new connection to a remote host (not using 0-RTT).