From d9b91436ef540a571d8d2ff5eda47dc0d3308784 Mon Sep 17 00:00:00 2001 From: tobyxdd Date: Wed, 1 Feb 2023 23:04:43 -0800 Subject: [PATCH] Bump quic-go to 0.32.0 --- adminlistener.go | 4 ++-- dohclient.go | 7 ++++--- dohlistener.go | 4 ++-- doqclient.go | 2 +- doqlistener.go | 2 +- go.mod | 9 +++++---- go.sum | 18 ++++++++++-------- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/adminlistener.go b/adminlistener.go index aa106f5..cbde137 100644 --- a/adminlistener.go +++ b/adminlistener.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" "github.com/sirupsen/logrus" ) diff --git a/dohclient.go b/dohclient.go index c7a623b..d387fcc 100644 --- a/dohclient.go +++ b/dohclient.go @@ -14,9 +14,10 @@ import ( "sync" "time" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" + "github.com/jtacoma/uritemplates" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" "github.com/miekg/dns" "github.com/sirupsen/logrus" "golang.org/x/net/http2" @@ -290,7 +291,7 @@ func quicDial(hostname, rAddr string, lAddr net.IP, tlsConfig *tls.Config, confi return quic.DialEarly(udpConn, udpAddr, hostname, tlsConfig, config) } -// Wrapper for http3.RoundTripper due to https://github.com/lucas-clemente/quic-go/issues/765 +// Wrapper for http3.RoundTripper due to https://github.com/quic-go/quic-go/issues/765 // This wrapper will transparently re-open expired connections. Should be removed once the issue // has been fixed upstream. type http3ReliableRoundTripper struct { diff --git a/dohlistener.go b/dohlistener.go index b028135..10d152d 100644 --- a/dohlistener.go +++ b/dohlistener.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "github.com/lucas-clemente/quic-go" - "github.com/lucas-clemente/quic-go/http3" "github.com/miekg/dns" + "github.com/quic-go/quic-go" + "github.com/quic-go/quic-go/http3" "github.com/sirupsen/logrus" ) diff --git a/doqclient.go b/doqclient.go index ff1d5e7..6d3eca9 100644 --- a/doqclient.go +++ b/doqclient.go @@ -8,9 +8,9 @@ import ( "sync" "time" - quic "github.com/lucas-clemente/quic-go" "github.com/miekg/dns" "github.com/pkg/errors" + quic "github.com/quic-go/quic-go" "github.com/sirupsen/logrus" ) diff --git a/doqlistener.go b/doqlistener.go index d73759c..d852b14 100644 --- a/doqlistener.go +++ b/doqlistener.go @@ -9,8 +9,8 @@ import ( "net" "time" - quic "github.com/lucas-clemente/quic-go" "github.com/miekg/dns" + quic "github.com/quic-go/quic-go" "github.com/sirupsen/logrus" ) diff --git a/go.mod b/go.mod index 9d5dbda..178dd62 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,11 @@ require ( github.com/RackSec/srslog v0.0.0-20180709174129-a4725f04ec91 github.com/heimdalr/dag v1.2.1 github.com/jtacoma/uritemplates v1.0.0 - github.com/lucas-clemente/quic-go v0.31.1 github.com/miekg/dns v1.1.50 github.com/oschwald/maxminddb-golang v1.10.0 github.com/pion/dtls/v2 v2.1.5 github.com/pkg/errors v0.9.1 + github.com/quic-go/quic-go v0.32.0 github.com/sirupsen/logrus v1.9.0 github.com/spf13/cobra v1.6.1 github.com/stretchr/testify v1.8.1 @@ -27,14 +27,15 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/kr/pretty v0.3.1 // indirect - github.com/marten-seemann/qpack v0.3.0 // indirect - github.com/marten-seemann/qtls-go1-18 v0.1.4 // indirect - github.com/marten-seemann/qtls-go1-19 v0.1.2 // indirect github.com/onsi/ginkgo/v2 v2.6.1 // indirect github.com/pion/logging v0.2.2 // indirect github.com/pion/transport v0.14.1 // indirect github.com/pion/udp v0.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qtls-go1-18 v0.2.0 // indirect + github.com/quic-go/qtls-go1-19 v0.2.0 // indirect + github.com/quic-go/qtls-go1-20 v0.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/crypto v0.4.0 // indirect golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect diff --git a/go.sum b/go.sum index 87e9159..7ab094e 100644 --- a/go.sum +++ b/go.sum @@ -34,14 +34,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lucas-clemente/quic-go v0.31.1 h1:O8Od7hfioqq0PMYHDyBkxU2aA7iZ2W9pjbrWuja2YR4= -github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYgE6JQ+54TLd/Dq2g= -github.com/marten-seemann/qpack v0.3.0 h1:UiWstOgT8+znlkDPOg2+3rIuYXJ2CnGDkGUXN6ki6hE= -github.com/marten-seemann/qpack v0.3.0/go.mod h1:cGfKPBiP4a9EQdxCwEwI/GEeWAsjSekBvx/X8mh58+g= -github.com/marten-seemann/qtls-go1-18 v0.1.4 h1:ogomB+lWV3Vmwiu6RTwDVTMGx+9j7SEi98e8QB35Its= -github.com/marten-seemann/qtls-go1-18 v0.1.4/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= -github.com/marten-seemann/qtls-go1-19 v0.1.2 h1:ZevAEqKXH0bZmoOBPiqX2h5rhQ7cbZi+X+rlq2JUbCE= -github.com/marten-seemann/qtls-go1-19 v0.1.2/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q= @@ -64,6 +56,16 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= +github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= +github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= +github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= +github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= +github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= +github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA= +github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=