miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ServerConfig -> StaticConfig to match the config file

This commit is contained in:
Frank Denis 2018-01-31 08:43:49 +01:00
parent cdb8faba75
commit d42ab83184
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dnscrypt-proxy/config.go
View File

@ -34,7 +34,7 @@ type Config struct {
BlockName BlockNameConfig `toml:"blacklist"` BlockName BlockNameConfig `toml:"blacklist"`
BlockIP BlockIPConfig `toml:"ip_blacklist"` BlockIP BlockIPConfig `toml:"ip_blacklist"`
ForwardFile string `toml:"forwarding_rules"` ForwardFile string `toml:"forwarding_rules"`
ServersConfig map[string]ServerConfig `toml:"static"` ServersConfig map[string]StaticConfig `toml:"static"`
SourcesConfig map[string]SourceConfig `toml:"sources"` SourcesConfig map[string]SourceConfig `toml:"sources"`
SourceRequireDNSSEC bool `toml:"require_dnssec"` SourceRequireDNSSEC bool `toml:"require_dnssec"`
SourceRequireNoLog bool `toml:"require_nolog"` SourceRequireNoLog bool `toml:"require_nolog"`
@ -68,7 +68,7 @@ func newConfig() Config {
} }
} }
type ServerConfig struct { type StaticConfig struct {
Stamp string Stamp string
} }
@ -247,14 +247,14 @@ func (config *Config) loadSources(proxy *Proxy) error {
} }
} }
for _, serverName := range config.ServerNames { for _, serverName := range config.ServerNames {
serverConfig, ok := config.ServersConfig[serverName] staticConfig, ok := config.ServersConfig[serverName]
if !ok { if !ok {
continue continue
} }
if len(serverConfig.Stamp) == 0 { if len(staticConfig.Stamp) == 0 {
dlog.Fatalf("Missing stamp for the static [%s] definition", serverName) dlog.Fatalf("Missing stamp for the static [%s] definition", serverName)
} }
stamp, err := NewServerStampFromString(serverConfig.Stamp) stamp, err := NewServerStampFromString(staticConfig.Stamp)
if err != nil { if err != nil {
return err return err
} }