mirror of
https://github.com/DNSCrypt/dnscrypt-proxy.git
synced 2025-03-04 02:14:40 +01:00
Fix typo and update message
This commit is contained in:
Frank Denis
parent
5861a58089
commit
197f13ea0f
4 changed files with 89 additions and 87 deletions
|
|
@ -612,7 +612,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error {
|
|||
}
|
||||
proxy.routes = &routes
|
||||
}
|
||||
proxy.skipAnonIncompatbibleResolvers = config.AnonymizedDNS.SkipIncompatible
|
||||
proxy.skipAnonIncompatibleResolvers = config.AnonymizedDNS.SkipIncompatible
|
||||
proxy.anonDirectCertFallback = config.AnonymizedDNS.DirectCertFallback
|
||||
|
||||
if config.DoHClientX509AuthLegacy.Creds != nil {
|
||||
|
|
|
|||
|
|
@ -766,6 +766,8 @@ fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familys
|
|||
# { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] }
|
||||
# ]
|
||||
|
||||
routes = { server_name='*', via = ['*'] }
|
||||
|
||||
|
||||
# Skip resolvers incompatible with anonymization instead of using them directly
|
||||
|
||||
|
|
|
|||
|
|
@ -19,88 +19,88 @@ import (
|
|||
)
|
||||
|
||||
type Proxy struct {
|
||||
pluginsGlobals PluginsGlobals
|
||||
serversInfo ServersInfo
|
||||
questionSizeEstimator QuestionSizeEstimator
|
||||
registeredServers []RegisteredServer
|
||||
dns64Resolvers []string
|
||||
dns64Prefixes []string
|
||||
serversBlockingFragments []string
|
||||
ednsClientSubnets []*net.IPNet
|
||||
queryLogIgnoredQtypes []string
|
||||
localDoHListeners []*net.TCPListener
|
||||
queryMeta []string
|
||||
udpListeners []*net.UDPConn
|
||||
sources []*Source
|
||||
tcpListeners []*net.TCPListener
|
||||
registeredRelays []RegisteredServer
|
||||
listenAddresses []string
|
||||
localDoHListenAddresses []string
|
||||
xTransport *XTransport
|
||||
dohCreds *map[string]DOHClientCreds
|
||||
allWeeklyRanges *map[string]WeeklyRanges
|
||||
routes *map[string][]string
|
||||
captivePortalMap *CaptivePortalMap
|
||||
nxLogFormat string
|
||||
localDoHCertFile string
|
||||
localDoHCertKeyFile string
|
||||
captivePortalMapFile string
|
||||
localDoHPath string
|
||||
mainProto string
|
||||
cloakFile string
|
||||
forwardFile string
|
||||
blockIPFormat string
|
||||
blockIPLogFile string
|
||||
allowedIPFile string
|
||||
allowedIPFormat string
|
||||
allowedIPLogFile string
|
||||
queryLogFormat string
|
||||
blockIPFile string
|
||||
whitelistNameFormat string
|
||||
whitelistNameLogFile string
|
||||
blockNameLogFile string
|
||||
whitelistNameFile string
|
||||
blockNameFile string
|
||||
queryLogFile string
|
||||
blockedQueryResponse string
|
||||
userName string
|
||||
nxLogFile string
|
||||
blockNameFormat string
|
||||
proxySecretKey [32]byte
|
||||
proxyPublicKey [32]byte
|
||||
certRefreshDelayAfterFailure time.Duration
|
||||
timeout time.Duration
|
||||
certRefreshDelay time.Duration
|
||||
cacheSize int
|
||||
logMaxBackups int
|
||||
logMaxAge int
|
||||
logMaxSize int
|
||||
cacheNegMinTTL uint32
|
||||
rejectTTL uint32
|
||||
cacheMaxTTL uint32
|
||||
clientsCount uint32
|
||||
maxClients uint32
|
||||
cacheMinTTL uint32
|
||||
cacheNegMaxTTL uint32
|
||||
cloakTTL uint32
|
||||
cache bool
|
||||
pluginBlockIPv6 bool
|
||||
ephemeralKeys bool
|
||||
pluginBlockUnqualified bool
|
||||
showCerts bool
|
||||
certIgnoreTimestamp bool
|
||||
skipAnonIncompatbibleResolvers bool
|
||||
anonDirectCertFallback bool
|
||||
pluginBlockUndelegated bool
|
||||
child bool
|
||||
daemonize bool
|
||||
requiredProps stamps.ServerInformalProperties
|
||||
ServerNames []string
|
||||
DisabledServerNames []string
|
||||
SourceIPv4 bool
|
||||
SourceIPv6 bool
|
||||
SourceDNSCrypt bool
|
||||
SourceDoH bool
|
||||
pluginsGlobals PluginsGlobals
|
||||
serversInfo ServersInfo
|
||||
questionSizeEstimator QuestionSizeEstimator
|
||||
registeredServers []RegisteredServer
|
||||
dns64Resolvers []string
|
||||
dns64Prefixes []string
|
||||
serversBlockingFragments []string
|
||||
ednsClientSubnets []*net.IPNet
|
||||
queryLogIgnoredQtypes []string
|
||||
localDoHListeners []*net.TCPListener
|
||||
queryMeta []string
|
||||
udpListeners []*net.UDPConn
|
||||
sources []*Source
|
||||
tcpListeners []*net.TCPListener
|
||||
registeredRelays []RegisteredServer
|
||||
listenAddresses []string
|
||||
localDoHListenAddresses []string
|
||||
xTransport *XTransport
|
||||
dohCreds *map[string]DOHClientCreds
|
||||
allWeeklyRanges *map[string]WeeklyRanges
|
||||
routes *map[string][]string
|
||||
captivePortalMap *CaptivePortalMap
|
||||
nxLogFormat string
|
||||
localDoHCertFile string
|
||||
localDoHCertKeyFile string
|
||||
captivePortalMapFile string
|
||||
localDoHPath string
|
||||
mainProto string
|
||||
cloakFile string
|
||||
forwardFile string
|
||||
blockIPFormat string
|
||||
blockIPLogFile string
|
||||
allowedIPFile string
|
||||
allowedIPFormat string
|
||||
allowedIPLogFile string
|
||||
queryLogFormat string
|
||||
blockIPFile string
|
||||
whitelistNameFormat string
|
||||
whitelistNameLogFile string
|
||||
blockNameLogFile string
|
||||
whitelistNameFile string
|
||||
blockNameFile string
|
||||
queryLogFile string
|
||||
blockedQueryResponse string
|
||||
userName string
|
||||
nxLogFile string
|
||||
blockNameFormat string
|
||||
proxySecretKey [32]byte
|
||||
proxyPublicKey [32]byte
|
||||
certRefreshDelayAfterFailure time.Duration
|
||||
timeout time.Duration
|
||||
certRefreshDelay time.Duration
|
||||
cacheSize int
|
||||
logMaxBackups int
|
||||
logMaxAge int
|
||||
logMaxSize int
|
||||
cacheNegMinTTL uint32
|
||||
rejectTTL uint32
|
||||
cacheMaxTTL uint32
|
||||
clientsCount uint32
|
||||
maxClients uint32
|
||||
cacheMinTTL uint32
|
||||
cacheNegMaxTTL uint32
|
||||
cloakTTL uint32
|
||||
cache bool
|
||||
pluginBlockIPv6 bool
|
||||
ephemeralKeys bool
|
||||
pluginBlockUnqualified bool
|
||||
showCerts bool
|
||||
certIgnoreTimestamp bool
|
||||
skipAnonIncompatibleResolvers bool
|
||||
anonDirectCertFallback bool
|
||||
pluginBlockUndelegated bool
|
||||
child bool
|
||||
daemonize bool
|
||||
requiredProps stamps.ServerInformalProperties
|
||||
ServerNames []string
|
||||
DisabledServerNames []string
|
||||
SourceIPv4 bool
|
||||
SourceIPv6 bool
|
||||
SourceDNSCrypt bool
|
||||
SourceDoH bool
|
||||
}
|
||||
|
||||
func (proxy *Proxy) registerUDPListener(conn *net.UDPConn) {
|
||||
|
|
|
|||
|
|
@ -426,11 +426,11 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
|
|||
}
|
||||
if knownBugs.fragmentsBlocked && relay != nil && relay.Dnscrypt != nil {
|
||||
relay = nil
|
||||
if proxy.skipAnonIncompatbibleResolvers {
|
||||
dlog.Infof("[%v] is incompatible with anonymization, it will be ignored", name)
|
||||
return ServerInfo{}, errors.New("Resolver is incompatible with anonymization")
|
||||
if proxy.skipAnonIncompatibleResolvers {
|
||||
dlog.Infof("[%v] couldn't be reached anonymously, it will be ignored", name)
|
||||
return ServerInfo{}, errors.New("Resolver couldn't be reached anonymously")
|
||||
}
|
||||
dlog.Warnf("[%v] is incompatible with anonymization", name)
|
||||
dlog.Warnf("[%v] couldn't be reached anonymously - check the relay and that your router doesn't drop UDP fragments", name)
|
||||
}
|
||||
if err != nil {
|
||||
return ServerInfo{}, err
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue