Skip to content
Commits on Source (6)
  • Andrey Meshkov's avatar
    Pull request: Fix #260: enable KeepAlive for DoQ · 101752c5
    Andrey Meshkov authored
    Merge in DNS/dnsproxy from doq_keepalive to master
    
    Squashed commit of the following:
    
    commit 401d87a3eb1159730f8963577037456b6ffe2d48
    Author: Andrey Meshkov <am@adguard.com>
    Date:   Mon Aug 15 10:27:57 2022 +0300
    
        Fix #260: enable KeepAlive for DoQ
    101752c5
  • Eugene Burkov's avatar
    Pull request: upd go, quic-go · 01d4e7cc
    Eugene Burkov authored
    Merge in DNS/dnsproxy from upd-quic-go to master
    
    Squashed commit of the following:
    
    commit cdca9547542f40dff4e8aa3c146ece84a9598ced
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 16:51:34 2022 +0300
    
        all: upd quic-go
    01d4e7cc
  • Eugene Burkov's avatar
    Pull request: Fix min go version · fc105c02
    Eugene Burkov authored
    Merge in DNS/dnsproxy from fix-readme to master
    
    Squashed commit of the following:
    
    commit ebf3dcaf799d6eaf39b4adac1e9c087167be9a39
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 17:39:17 2022 +0300
    
        all: fix min go version
    fc105c02
  • Eugene Burkov's avatar
    Pull request: Update specs · 2d9ef2be
    Eugene Burkov authored
    Merge in DNS/dnsproxy from fix-specs to master
    
    Squashed commit of the following:
    
    commit 1cd4f165aed73d22c7643af398eb44ce39314736
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 19:01:54 2022 +0300
    
        all: use task env vars
    
    commit 8f98ececa3f6f5a4ef3d4e92ce01f6d38ab31403
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 18:50:09 2022 +0300
    
        all: upd golangci-lint version
    
    commit 835234b3afd5752abb0d0f338d64e171a6149777
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 18:25:13 2022 +0300
    
        all: upd specs
    2d9ef2be
  • Eugene Burkov's avatar
    Pull request: Fix GitHub specs · 2193a719
    Eugene Burkov authored
    Merge in DNS/dnsproxy from fix-gh-specs to master
    
    Squashed commit of the following:
    
    commit bee7eaa871b8d0b8a4fe3f64c5930303a68e87e0
    Author: Eugene Burkov <E.Burkov@AdGuard.COM>
    Date:   Thu Aug 18 19:20:30 2022 +0300
    
        all: fix gh specs
    2193a719
  • Ainar Garipov's avatar
    Pull request: upd-deps · f89e1bb9
    Ainar Garipov authored
    Merge in DNS/dnsproxy from upd-deps to master
    
    Squashed commit of the following:
    
    commit a0658ad5479a6b60185ab99be33c76814e1898e0
    Author: Ainar Garipov <A.Garipov@AdGuard.COM>
    Date:   Tue Aug 30 17:03:25 2022 +0300
    
        all: upd deps, enable go 1.19 building
    f89e1bb9
name: Build
'env':
'GO_VERSION': '1.17'
'GO_VERSION': '1.18'
'on':
'push':
......
......@@ -17,9 +17,10 @@ jobs:
- ubuntu-latest
- macos-latest
steps:
- uses: actions/setup-go@v3
- name: setup-go
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x
- uses: actions/checkout@v3
......@@ -28,7 +29,7 @@ jobs:
with:
# This field is required. Dont set the patch version to always use
# the latest patch version.
version: v1.43
version: v1.45.1
notify:
needs:
- golangci
......
......@@ -24,7 +24,7 @@ A simple DNS proxy server that supports all existing DNS protocols including `DN
## How to build
You will need Go v1.16 or later.
You will need Go v1.18 or later.
```shell
$ go build -mod=vendor
......
......@@ -5,7 +5,7 @@ plan:
key: DNSPROXYSPECS
name: dnsproxy - Build and run tests
variables:
dockerGo: adguard/golang-ubuntu:4.0
dockerGo: adguard/golang-ubuntu:5.0
stages:
- Tests:
......@@ -27,6 +27,7 @@ Test:
force-clean-build: 'true'
- script:
interpreter: SHELL
environment: GOFLAGS="-buildvcs=false"
scripts:
- |-
set -e -f -u -x
......
module github.com/AdguardTeam/dnsproxy
go 1.17
go 1.18
require (
github.com/AdguardTeam/golibs v0.10.8
github.com/ameshkov/dnscrypt/v2 v2.2.3
github.com/AdguardTeam/golibs v0.10.9
github.com/ameshkov/dnscrypt/v2 v2.2.5
github.com/ameshkov/dnsstamps v1.0.3
github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47
github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0
github.com/jessevdk/go-flags v1.5.0
github.com/lucas-clemente/quic-go v0.27.1
github.com/miekg/dns v1.1.44
github.com/lucas-clemente/quic-go v0.29.0
github.com/miekg/dns v1.1.50
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20220225172249-27dd8689420f
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
github.com/stretchr/testify v1.8.0
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
gopkg.in/yaml.v3 v3.0.1
)
require (
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 // indirect
github.com/cheekybits/genny v1.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.10 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
golang.org/x/tools v0.1.12 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
)
This diff is collapsed.
......@@ -220,7 +220,15 @@ func (p *dnsOverQUIC) openConnection() (conn quic.Connection, err error) {
}
addr := udpConn.RemoteAddr().String()
quicConfig := &quic.Config{}
quicConfig := &quic.Config{
// Set the keep alive interval to 20s as it would be in the
// quic-go@v0.27.1 with KeepAlive field set to true. This value is
// specified in
// https://pkg.go.dev/github.com/lucas-clemente/quic-go/internal/protocol#MaxKeepAliveInterval.
//
// TODO(ameshkov): Consider making it configurable.
KeepAlivePeriod: 20 * time.Second,
}
conn, err = quic.DialAddrContext(context.Background(), addr, tlsConfig, quicConfig)
if err != nil {
return nil, fmt.Errorf("opening quic connection to %s: %w", p.Address(), err)
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.