a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get rid of duplicate variable definitions

This commit is contained in:
Eugene Bujak 2018-11-30 13:35:22 +03:00
parent ce615e1855
commit 057db71f3b
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.go
View File

@ -68,9 +68,8 @@ var config = configuration{
binaryFile: "coredns", // only filename, no path binaryFile: "coredns", // only filename, no path
coreFile: "Corefile", // only filename, no path coreFile: "Corefile", // only filename, no path
FilteringConfig: dnsforward.FilteringConfig{ FilteringConfig: dnsforward.FilteringConfig{
ProtectionEnabled: true, ProtectionEnabled: true, // whether or not use any of dnsfilter features
FilteringEnabled: true, FilteringEnabled: true, // whether or not use filter lists
SafeBrowsingEnabled: false,
BlockedResponseTTL: 10, // in seconds BlockedResponseTTL: 10, // in seconds
}, },
QueryLogEnabled: true, QueryLogEnabled: true,

2
coredns.go
View File

@ -32,7 +32,7 @@ func generateServerConfig() dnsforward.ServerConfig {
newconfig := dnsforward.ServerConfig{ newconfig := dnsforward.ServerConfig{
UDPListenAddr: &net.UDPAddr{Port: config.CoreDNS.Port}, UDPListenAddr: &net.UDPAddr{Port: config.CoreDNS.Port},
BlockedResponseTTL: config.CoreDNS.BlockedResponseTTL, FilteringConfig: config.CoreDNS.FilteringConfig,
Filters: filters, Filters: filters,
} }

11
dnsforward/dnsforward.go
View File

@ -76,17 +76,14 @@ func (s *Server) RUnlock() {
type FilteringConfig struct { type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"` ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"` FilteringEnabled bool `yaml:"filtering_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"` BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"` dnsfilter.Config `yaml:",inline"`
ParentalSensitivity int `yaml:"parental_sensitivity"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"`
} }
// The zero ServerConfig is empty and ready for use. // The zero ServerConfig is empty and ready for use.
type ServerConfig struct { type ServerConfig struct {
UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *) UDPListenAddr *net.UDPAddr // if nil, then default is is used (port 53 on *)
BlockedResponseTTL uint32 // if 0, then default is used (3600)
Upstreams []Upstream Upstreams []Upstream
Filters []dnsfilter.Filter Filters []dnsfilter.Filter
@ -95,7 +92,7 @@ type ServerConfig struct {
var defaultValues = ServerConfig{ var defaultValues = ServerConfig{
UDPListenAddr: &net.UDPAddr{Port: 53}, UDPListenAddr: &net.UDPAddr{Port: 53},
BlockedResponseTTL: 3600, FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600},
Upstreams: []Upstream{ Upstreams: []Upstream{
//// dns over HTTPS //// dns over HTTPS
// &dnsOverHTTPS{Address: "https://1.1.1.1/dns-query"}, // &dnsOverHTTPS{Address: "https://1.1.1.1/dns-query"},