From 09dfcbf46b1ae61ac1ba162e2b74c70a0ea63858 Mon Sep 17 00:00:00 2001 From: Benedikt Spies Date: Wed, 2 Nov 2022 20:55:11 +0100 Subject: [PATCH] update dependencies --- client/client.go | 16 ++--- common/0rtt_utils.go | 56 ++++----------- common/migration_tracer.go | 121 +-------------------------------- common/single_session_cache.go | 54 +++++++++++++++ common/single_token_store.go | 53 +++++++++++++++ common/state_tracer.go | 120 +------------------------------- go.mod | 28 ++++---- go.sum | 69 +++++++------------ main.go | 3 +- server/qperf_server_session.go | 12 ++-- server/qperf_server_stream.go | 4 +- server/server.go | 14 ++-- 12 files changed, 188 insertions(+), 362 deletions(-) create mode 100644 common/single_session_cache.go create mode 100644 common/single_token_store.go diff --git a/client/client.go b/client/client.go index e6f7fdc..371ab3a 100644 --- a/client/client.go +++ b/client/client.go @@ -122,16 +122,16 @@ func Run(addr net.UDPAddr, timeToFirstByteOnly bool, printRaw bool, createQLog b c.state.SetStartTime() - var session quic.Session + var connection quic.Connection if use0RTT { var err error - session, err = quic.DialAddrEarly(addr.String(), tlsConf, &conf) + connection, err = quic.DialAddrEarly(addr.String(), tlsConf, &conf) if err != nil { panic(fmt.Errorf("failed to establish connection: %w", err)) } } else { var err error - session, err = quic.DialAddr(addr.String(), tlsConf, &conf) + connection, err = quic.DialAddr(addr.String(), tlsConf, &conf) if err != nil { panic(fmt.Errorf("failed to establish connection: %w", err)) } @@ -140,7 +140,7 @@ func Run(addr net.UDPAddr, timeToFirstByteOnly bool, printRaw bool, createQLog b c.state.SetEstablishmentTime() c.reportEstablishmentTime(&c.state) - if session.ExtraStreamEncrypted() { + if connection.ExtraStreamEncrypted() { c.logger.Infof("use XSE-QUIC") } @@ -148,7 +148,7 @@ func Run(addr net.UDPAddr, timeToFirstByteOnly bool, printRaw bool, createQLog b if migrateAfter.Nanoseconds() != 0 { go func() { time.Sleep(migrateAfter) - addr, err := session.MigrateUDPSocket() + addr, err := connection.MigrateUDPSocket() if err != nil { panic(fmt.Errorf("failed to migrate UDP socket: %w", err)) } @@ -161,11 +161,11 @@ func Run(addr net.UDPAddr, timeToFirstByteOnly bool, printRaw bool, createQLog b signal.Notify(intChan, os.Interrupt) go func() { <-intChan - _ = session.CloseWithError(quic.ApplicationErrorCode(quic.NoError), "client_closed") + _ = connection.CloseWithError(quic.ApplicationErrorCode(quic.NoError), "client_closed") os.Exit(0) }() - stream, err := session.OpenStream() + stream, err := connection.OpenStream() if err != nil { panic(fmt.Errorf("failed to open stream: %w", err)) } @@ -199,7 +199,7 @@ func Run(addr net.UDPAddr, timeToFirstByteOnly bool, printRaw bool, createQLog b } } - err = session.CloseWithError(common.RuntimeReachedErrorCode, "runtime_reached") + err = connection.CloseWithError(common.RuntimeReachedErrorCode, "runtime_reached") if err != nil { panic(fmt.Errorf("failed to close connection: %w", err)) } diff --git a/common/0rtt_utils.go b/common/0rtt_utils.go index 5a3202f..dbed7e6 100644 --- a/common/0rtt_utils.go +++ b/common/0rtt_utils.go @@ -4,13 +4,12 @@ import ( "crypto/tls" "errors" "github.com/lucas-clemente/quic-go" - "net" - "time" ) // PingToGatherSessionTicketAndToken establishes a new QUIC connection. // As soon as the session ticket and the token is received, the connection is closed. // This function can be used to prepare for 0-RTT +// TODO add timeout func PingToGatherSessionTicketAndToken(addr string, tlsConf *tls.Config, config *quic.Config) error { if tlsConf.ClientSessionCache == nil { return errors.New("session cache is nil") @@ -18,53 +17,26 @@ func PingToGatherSessionTicketAndToken(addr string, tlsConf *tls.Config, config if config.TokenStore == nil { panic("session cache is nil") } - session, err := quic.DialAddr(addr, tlsConf, config) + + singleSessionCache := NewSingleSessionCache() + singleTokenStore := NewSingleTokenStore() + + tmpTlsConf := tlsConf.Clone() + tmpTlsConf.ClientSessionCache = singleSessionCache + tmpConfig := config.Clone() + tmpConfig.TokenStore = singleTokenStore + + connection, err := quic.DialAddr(addr, tmpTlsConf, tmpConfig) if err != nil { return err } - sessionCacheKey := sessionCacheKey(session.RemoteAddr(), tlsConf) - tokenStoreKey := tokenStoreKey(session.RemoteAddr(), tlsConf) + tlsConf.ClientSessionCache.Put(singleSessionCache.Await()) + config.TokenStore.Put(singleTokenStore.Await()) - // await session ticket - for { - time.Sleep(time.Millisecond) - _, ok := tlsConf.ClientSessionCache.Get(sessionCacheKey) - if ok { - break - } - } - // await token - for { - time.Sleep(time.Millisecond) - token := config.TokenStore.Pop(tokenStoreKey) - if token != nil { - config.TokenStore.Put(tokenStoreKey, token) // put back again - break - } - } - err = session.CloseWithError(quic.ApplicationErrorCode(0), "cancel") + err = connection.CloseWithError(quic.ApplicationErrorCode(0), "cancel") if err != nil { return err } return nil } - -// inspired by qtls.clientSessionCacheKey implementation -// TODO avoid duplicate code -func sessionCacheKey(serverAddr net.Addr, tlsConf *tls.Config) string { - if len(tlsConf.ServerName) > 0 { - return "qtls-" + tlsConf.ServerName - } - return "qtls-" + serverAddr.String() -} - -// inspired by quic.newClientSession implementation -// TODO avoid duplicate code -func tokenStoreKey(serverAddr net.Addr, tlsConf *tls.Config) string { - if len(tlsConf.ServerName) > 0 { - return tlsConf.ServerName - } else { - return serverAddr.String() - } -} diff --git a/common/migration_tracer.go b/common/migration_tracer.go index 1805874..70072fe 100644 --- a/common/migration_tracer.go +++ b/common/migration_tracer.go @@ -4,14 +4,14 @@ import ( "context" "github.com/lucas-clemente/quic-go/logging" "net" - "time" ) type migrationTracer struct { + logging.NullTracer onMigration func(addr net.Addr) } -func NewMigrationTracer(onMigration func(addr net.Addr)) *migrationTracer { +func NewMigrationTracer(onMigration func(addr net.Addr)) logging.Tracer { return &migrationTracer{ onMigration: onMigration, } @@ -23,126 +23,11 @@ func (a migrationTracer) TracerForConnection(ctx context.Context, p logging.Pers } } -func (a migrationTracer) SentPacket(addr net.Addr, header *logging.Header, count logging.ByteCount, frames []logging.Frame) { - // ignore -} - -func (a migrationTracer) DroppedPacket(addr net.Addr, packetType logging.PacketType, count logging.ByteCount, reason logging.PacketDropReason) { - // ignore -} - type connectionTracer struct { + logging.NullConnectionTracer onMigration func(addr net.Addr) } -func (a connectionTracer) StartedConnection(local, remote net.Addr, srcConnID, destConnID logging.ConnectionID) { - // ignore -} - -func (a connectionTracer) NegotiatedVersion(chosen logging.VersionNumber, clientVersions, serverVersions []logging.VersionNumber) { - // ignore -} - -func (a connectionTracer) ClosedConnection(err error) { - // ignore -} - -func (a connectionTracer) SentTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a connectionTracer) ReceivedTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a connectionTracer) RestoredTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a connectionTracer) SentPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, ack *logging.AckFrame, frames []logging.Frame) { - // ignore -} - -func (a connectionTracer) ReceivedVersionNegotiationPacket(header *logging.Header, numbers []logging.VersionNumber) { - // ignore -} - -func (a connectionTracer) ReceivedRetry(header *logging.Header) { - // ignore -} - -func (a connectionTracer) ReceivedPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, frames []logging.Frame) { - // ignore -} - -func (a connectionTracer) BufferedPacket(packetType logging.PacketType) { - // ignore -} - -func (a connectionTracer) DroppedPacket(packetType logging.PacketType, count logging.ByteCount, reason logging.PacketDropReason) { - // ignore -} - -func (a connectionTracer) UpdatedMetrics(rttStats *logging.RTTStats, cwnd, bytesInFlight logging.ByteCount, packetsInFlight int) { - // ignore -} - -func (a connectionTracer) AcknowledgedPacket(level logging.EncryptionLevel, number logging.PacketNumber) { - // ignore -} - -func (a connectionTracer) LostPacket(level logging.EncryptionLevel, number logging.PacketNumber, reason logging.PacketLossReason) { - // ignore -} - -func (a connectionTracer) UpdatedCongestionState(state logging.CongestionState) { - // ignore -} - -func (a connectionTracer) UpdatedPTOCount(value uint32) { - // ignore -} - -func (a connectionTracer) UpdatedKeyFromTLS(level logging.EncryptionLevel, perspective logging.Perspective) { - // ignore -} - -func (a connectionTracer) UpdatedKey(generation logging.KeyPhase, remote bool) { - // ignore -} - -func (a connectionTracer) DroppedEncryptionLevel(level logging.EncryptionLevel) { - // ignore -} - -func (a connectionTracer) DroppedKey(generation logging.KeyPhase) { - // ignore -} - -func (a connectionTracer) SetLossTimer(timerType logging.TimerType, level logging.EncryptionLevel, time time.Time) { - // ignore -} - -func (a connectionTracer) LossTimerExpired(timerType logging.TimerType, level logging.EncryptionLevel) { - // ignore -} - -func (a connectionTracer) LossTimerCanceled() { - // ignore -} - -func (a connectionTracer) Close() { - // ignore -} - -func (a connectionTracer) Debug(name, msg string) { - // ignore -} - func (a connectionTracer) UpdatedPath(newRemote net.Addr) { a.onMigration(newRemote) } - -func (a connectionTracer) XseReceiveRecord(_ logging.StreamID, _ int, _ int) { - // ignore -} diff --git a/common/single_session_cache.go b/common/single_session_cache.go new file mode 100644 index 0000000..1f3bf05 --- /dev/null +++ b/common/single_session_cache.go @@ -0,0 +1,54 @@ +package common + +import ( + "context" + "crypto/tls" + "github.com/marten-seemann/qtls-go1-19" +) + +type SingleSessionCache struct { + emptyContext context.Context + emptyContextCancel context.CancelFunc + sessionKey *string + session *tls.ClientSessionState +} + +var _ qtls.ClientSessionCache = (*SingleSessionCache)(nil) + +func (s *SingleSessionCache) Get(sessionKey string) (session *tls.ClientSessionState, ok bool) { + select { + case <-s.emptyContext.Done(): + if sessionKey == *s.sessionKey { + return session, true + } + default: // do not wait + } + return nil, false +} + +func (s *SingleSessionCache) Put(sessionKey string, cs *tls.ClientSessionState) { + select { + case <-s.emptyContext.Done(): + return // already set + default: + //TODO make thread safe + s.sessionKey = &sessionKey + s.session = cs + s.emptyContextCancel() + } +} + +func (s *SingleSessionCache) Await() (string, *tls.ClientSessionState) { + <-s.emptyContext.Done() + return *s.sessionKey, s.session +} + +func NewSingleSessionCache() *SingleSessionCache { + emptyContext, emptyContextCancel := context.WithCancel(context.Background()) + return &SingleSessionCache{ + emptyContext, + emptyContextCancel, + nil, + nil, + } +} diff --git a/common/single_token_store.go b/common/single_token_store.go new file mode 100644 index 0000000..576d363 --- /dev/null +++ b/common/single_token_store.go @@ -0,0 +1,53 @@ +package common + +import ( + "context" + "github.com/lucas-clemente/quic-go" +) + +type SingleTokenStore struct { + emptyContext context.Context + emptyContextCancel context.CancelFunc + key *string + token *quic.ClientToken +} + +var _ quic.TokenStore = (*SingleTokenStore)(nil) + +// Pop does not remove the token +func (s *SingleTokenStore) Pop(key string) (token *quic.ClientToken) { + select { + case <-s.emptyContext.Done(): + if key == *s.key { + return s.token + } + default: // do not wait + } + return nil +} + +func (s *SingleTokenStore) Put(key string, token *quic.ClientToken) { + select { + case <-s.emptyContext.Done(): + return // already set + default: + //TODO make thread safe + s.key = &key + s.token = token + s.emptyContextCancel() + } +} + +func (s *SingleTokenStore) Await() (string, *quic.ClientToken) { + <-s.emptyContext.Done() + return *s.key, s.token +} +func NewSingleTokenStore() *SingleTokenStore { + emptyContext, emptyContextCancel := context.WithCancel(context.Background()) + return &SingleTokenStore{ + emptyContext, + emptyContextCancel, + nil, + nil, + } +} diff --git a/common/state_tracer.go b/common/state_tracer.go index 7cbce16..0278571 100644 --- a/common/state_tracer.go +++ b/common/state_tracer.go @@ -3,11 +3,10 @@ package common import ( "context" "github.com/lucas-clemente/quic-go/logging" - "net" - "time" ) type StateTracer struct { + logging.NullTracer State *State } @@ -17,126 +16,11 @@ func (a StateTracer) TracerForConnection(ctx context.Context, p logging.Perspect } } -func (a StateTracer) SentPacket(addr net.Addr, header *logging.Header, count logging.ByteCount, frames []logging.Frame) { - // ignore -} - -func (a StateTracer) DroppedPacket(addr net.Addr, packetType logging.PacketType, count logging.ByteCount, reason logging.PacketDropReason) { - // ignore -} - type StateConnectionTracer struct { + logging.NullConnectionTracer State *State } -func (a StateConnectionTracer) StartedConnection(local, remote net.Addr, srcConnID, destConnID logging.ConnectionID) { - // ignore -} - -func (a StateConnectionTracer) NegotiatedVersion(chosen logging.VersionNumber, clientVersions, serverVersions []logging.VersionNumber) { - // ignore -} - -func (a StateConnectionTracer) ClosedConnection(err error) { - // ignore -} - -func (a StateConnectionTracer) SentTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a StateConnectionTracer) ReceivedTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a StateConnectionTracer) RestoredTransportParameters(parameters *logging.TransportParameters) { - // ignore -} - -func (a StateConnectionTracer) SentPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, ack *logging.AckFrame, frames []logging.Frame) { - // ignore -} - -func (a StateConnectionTracer) ReceivedVersionNegotiationPacket(header *logging.Header, numbers []logging.VersionNumber) { - // ignore -} - -func (a StateConnectionTracer) ReceivedRetry(header *logging.Header) { - // ignore -} - func (a StateConnectionTracer) ReceivedPacket(hdr *logging.ExtendedHeader, size logging.ByteCount, frames []logging.Frame) { a.State.AddReceivedPackets(1) } - -func (a StateConnectionTracer) BufferedPacket(packetType logging.PacketType) { - // ignore -} - -func (a StateConnectionTracer) DroppedPacket(packetType logging.PacketType, count logging.ByteCount, reason logging.PacketDropReason) { - // ignore -} - -func (a StateConnectionTracer) UpdatedMetrics(rttStats *logging.RTTStats, cwnd, bytesInFlight logging.ByteCount, packetsInFlight int) { - // ignore -} - -func (a StateConnectionTracer) AcknowledgedPacket(level logging.EncryptionLevel, number logging.PacketNumber) { - // ignore -} - -func (a StateConnectionTracer) LostPacket(level logging.EncryptionLevel, number logging.PacketNumber, reason logging.PacketLossReason) { - // ignore -} - -func (a StateConnectionTracer) UpdatedCongestionState(state logging.CongestionState) { - // ignore -} - -func (a StateConnectionTracer) UpdatedPTOCount(value uint32) { - // ignore -} - -func (a StateConnectionTracer) UpdatedKeyFromTLS(level logging.EncryptionLevel, perspective logging.Perspective) { - // ignore -} - -func (a StateConnectionTracer) UpdatedKey(generation logging.KeyPhase, remote bool) { - // ignore -} - -func (a StateConnectionTracer) DroppedEncryptionLevel(level logging.EncryptionLevel) { - // ignore -} - -func (a StateConnectionTracer) DroppedKey(generation logging.KeyPhase) { - // ignore -} - -func (a StateConnectionTracer) SetLossTimer(timerType logging.TimerType, level logging.EncryptionLevel, time time.Time) { - // ignore -} - -func (a StateConnectionTracer) LossTimerExpired(timerType logging.TimerType, level logging.EncryptionLevel) { - // ignore -} - -func (a StateConnectionTracer) LossTimerCanceled() { - // ignore -} - -func (a StateConnectionTracer) Close() { - // ignore -} - -func (a StateConnectionTracer) Debug(name, msg string) { - // ignore -} - -func (a StateConnectionTracer) UpdatedPath(newRemote net.Addr) { - // ignore -} - -func (a StateConnectionTracer) XseReceiveRecord(_ logging.StreamID, _ int, _ int) { - // ignore -} diff --git a/go.mod b/go.mod index 505d092..9ad99c3 100644 --- a/go.mod +++ b/go.mod @@ -1,38 +1,36 @@ module qperf-go -go 1.17 +go 1.19 replace ( - github.com/birneee/hquic-proxy-go => github.com/birneee/hquic-proxy-go v0.3.0 - github.com/lucas-clemente/quic-go => github.com/birneee/quic-go v0.28.0 - github.com/marten-seemann/qtls-go1-17 => github.com/birneee/qtls-go1-17 v0.4.0 + github.com/lucas-clemente/quic-go => github.com/birneee/quic-go v0.29.0 + github.com/marten-seemann/qtls-go1-19 => github.com/birneee/qtls-go1-19 v0.1.0 ) require ( - github.com/birneee/hquic-proxy-go v1.0.0 + github.com/birneee/hquic-proxy-go v0.4.0 github.com/dustin/go-humanize v1.0.0 - github.com/lucas-clemente/quic-go v0.24.0 + github.com/lucas-clemente/quic-go v0.29.2 + github.com/marten-seemann/qtls-go1-19 v0.1.1 github.com/urfave/cli/v2 v2.3.0 ) require ( - github.com/cheekybits/genny v1.0.0 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect github.com/francoispqt/gojay v1.2.13 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect - github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 // indirect + github.com/golang/mock v1.6.0 // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.4 // indirect github.com/russross/blackfriday/v2 v2.0.1 // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect - golang.org/x/mod v0.4.2 // indirect - golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect - golang.org/x/tools v0.1.1 // indirect + golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect + golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect + golang.org/x/tools v0.1.10 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect ) diff --git a/go.sum b/go.sum index c615cb9..bbe2d5a 100644 --- a/go.sum +++ b/go.sum @@ -10,16 +10,16 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/birneee/hquic-proxy-go v0.3.0 h1:18/sB1053efNv78QJemfXLijtg2VYbJ6z+/2ikhNITc= -github.com/birneee/hquic-proxy-go v0.3.0/go.mod h1:IVY/EKjtk0IwWP8VDVbgg10qz1LMj1dAsEezci3hjNM= -github.com/birneee/qtls-go1-17 v0.4.0 h1:Q5P4zc+/JEp52bxQ0xRlMXg8vWrXo18k4/iO58UDeT0= -github.com/birneee/qtls-go1-17 v0.4.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= -github.com/birneee/quic-go v0.28.0 h1:iwXLj2o6GYsDM2nWLXgNUqg0MBdX5cDDsuGmJK8vJDU= -github.com/birneee/quic-go v0.28.0/go.mod h1:CXF8U6WgQRsEeI8jH3DAWtLqQRMBYK93l67U0S9iHks= +github.com/birneee/hquic-proxy-go v0.4.0 h1:1uUMNwSl7oxYm2K9sNGeXeASXZU9EZsF3cIFbapAQIA= +github.com/birneee/hquic-proxy-go v0.4.0/go.mod h1:lrQr9vcpcdnlD0RDVP283Lbzl0IGByZLTjUwZyJVPxA= +github.com/birneee/qtls-go1-19 v0.0.0-20221102161605-b9b660f36d18 h1:zI4ocLZqvAvF9sFFi2a78ibbsLIdvypjSXVxrZF3efA= +github.com/birneee/qtls-go1-19 v0.0.0-20221102161605-b9b660f36d18/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= +github.com/birneee/qtls-go1-19 v0.1.0 h1:6Uq+3e1RgZH0olDHU2rNK+JB7D7IUVr0KBBrsZoxQRI= +github.com/birneee/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= +github.com/birneee/quic-go v0.29.0 h1:dCzzSMPkkx4J6FXQGKuCik6MDMlyRwEjYmNpARYMsgY= +github.com/birneee/quic-go v0.29.0/go.mod h1:u4FTgYtnFj7BhBDXN+1Ebvsrw1zRRb18hXsrwzdIHnU= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= -github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= @@ -45,7 +45,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -55,16 +54,13 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -85,12 +81,8 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= -github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= -github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco= -github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= -github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1 h1:EnzzN9fPUkUck/1CuY1FlzBaIYMoiBsdwTNmNGkwUUM= -github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI= +github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE= +github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -102,14 +94,11 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -118,7 +107,6 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -167,16 +155,19 @@ golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -184,16 +175,14 @@ golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -215,23 +204,19 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -239,11 +224,11 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -270,12 +255,9 @@ google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= @@ -286,7 +268,6 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/main.go b/main.go index e5fcd11..3ca14d5 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,6 @@ import ( "time" ) -const defaultProxyControlPort = 18081 const defaultProxyTLSCertificateFile = "proxy.crt" const defaultProxyTLSKeyFile = "proxy.key" @@ -34,7 +33,7 @@ func main() { &cli.UintFlag{ Name: "port", Usage: "port of the proxy to listen on, for control connections", - Value: defaultProxyControlPort, + Value: common.DefaultProxyControlPort, }, &cli.StringFlag{ Name: "tls-cert", diff --git a/server/qperf_server_session.go b/server/qperf_server_session.go index 96892d9..cb39f38 100644 --- a/server/qperf_server_session.go +++ b/server/qperf_server_session.go @@ -10,8 +10,8 @@ import ( ) type qperfServerSession struct { - session quic.Session - sessionID uint64 + connection quic.Connection + connectionID uint64 // used to detect migration currentRemoteAddr net.Addr logger common.Logger @@ -20,12 +20,12 @@ type qperfServerSession struct { func (s *qperfServerSession) run() { s.logger.Infof("open") - if s.session.ExtraStreamEncrypted() { + if s.connection.ExtraStreamEncrypted() { s.logger.Infof("use XSE-QUIC") } for { - quicStream, err := s.session.AcceptStream(context.Background()) + quicStream, err := s.connection.AcceptStream(context.Background()) if err != nil { s.close(err) return @@ -42,8 +42,8 @@ func (s *qperfServerSession) run() { } func (s *qperfServerSession) checkIfRemoteAddrChanged() { - if s.currentRemoteAddr != s.session.RemoteAddr() { - s.currentRemoteAddr = s.session.RemoteAddr() + if s.currentRemoteAddr != s.connection.RemoteAddr() { + s.currentRemoteAddr = s.connection.RemoteAddr() s.logger.Infof("migrated to %s", s.currentRemoteAddr) } } diff --git a/server/qperf_server_stream.go b/server/qperf_server_stream.go index 9509926..b8fcfe0 100644 --- a/server/qperf_server_stream.go +++ b/server/qperf_server_stream.go @@ -3,7 +3,7 @@ package server import ( "fmt" "github.com/lucas-clemente/quic-go" - "io/ioutil" + "io" "qperf-go/common" ) @@ -16,7 +16,7 @@ type qperfServerStream struct { func (s *qperfServerStream) run() { s.logger.Infof("open") - request, err := ioutil.ReadAll(s.stream) + request, err := io.ReadAll(s.stream) if err != nil { s.session.close(err) s.logger.Errorf("%s", err) diff --git a/server/server.go b/server/server.go index f9decf8..c6c9331 100644 --- a/server/server.go +++ b/server/server.go @@ -86,22 +86,22 @@ func Run(addr net.UDPAddr, createQLog bool, migrateAfter time.Duration, tlsServe }() } - var nextSessionId uint64 = 0 + var nextConnectionId uint64 = 0 for { - quicSession, err := listener.Accept(context.Background()) + quicConnection, err := listener.Accept(context.Background()) if err != nil { panic(err) } qperfSession := &qperfServerSession{ - session: quicSession, - sessionID: nextSessionId, - currentRemoteAddr: quicSession.RemoteAddr(), - logger: logger.WithPrefix(fmt.Sprintf("session %d", nextSessionId)), + connection: quicConnection, + connectionID: nextConnectionId, + currentRemoteAddr: quicConnection.RemoteAddr(), + logger: logger.WithPrefix(fmt.Sprintf("connection %d", nextConnectionId)), } go qperfSession.run() - nextSessionId += 1 + nextConnectionId += 1 } }