mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-16 10:28:29 -07:00
434032f8e3
Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772.
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
39 lines
1.4 KiB
Modula-2
39 lines
1.4 KiB
Modula-2
module github.com/AdguardTeam/AdGuardHome
|
|
|
|
go 1.16
|
|
|
|
require (
|
|
github.com/AdguardTeam/dnsproxy v0.39.12
|
|
github.com/AdguardTeam/golibs v0.10.3
|
|
github.com/AdguardTeam/urlfilter v0.15.0
|
|
github.com/NYTimes/gziphandler v1.1.1
|
|
github.com/ameshkov/dnscrypt/v2 v2.2.2
|
|
github.com/digineo/go-ipset/v2 v2.2.1
|
|
github.com/fsnotify/fsnotify v1.4.9
|
|
github.com/go-ping/ping v0.0.0-20210506233800-ff8be3320020
|
|
github.com/google/go-cmp v0.5.5
|
|
github.com/google/gopacket v1.1.19
|
|
github.com/google/renameio v1.0.1
|
|
github.com/insomniacslk/dhcp v0.0.0-20210310193751-cfd4d47082c2
|
|
github.com/kardianos/service v1.2.0
|
|
github.com/lucas-clemente/quic-go v0.21.1
|
|
github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
|
|
github.com/mdlayher/netlink v1.4.0
|
|
github.com/mdlayher/raw v0.0.0-20210412142147-51b895745faf
|
|
github.com/miekg/dns v1.1.43
|
|
github.com/satori/go.uuid v1.2.0
|
|
github.com/stretchr/objx v0.1.1 // indirect
|
|
github.com/stretchr/testify v1.7.0
|
|
github.com/ti-mo/netfilter v0.4.0
|
|
go.etcd.io/bbolt v1.3.6
|
|
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
|
|
golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6
|
|
golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3
|
|
gopkg.in/natefinch/lumberjack.v2 v2.0.0
|
|
gopkg.in/yaml.v2 v2.4.0
|
|
howett.net/plist v0.0.0-20201203080718-1454fab16a06
|
|
)
|
|
|
|
// TODO(e.burkov): Get rid of the fork in v0.108.0.
|
|
replace github.com/insomniacslk/dhcp => github.com/AdguardTeam/dhcp v0.0.0-20210519141215-51808c73c0bf
|