mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-03-04 10:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo and update message

Browse source
This commit is contained in:
Frank Denis 2021-01-03 16:00:02 +01:00
parent 5861a58089
commit 197f13ea0f
4 changed files with 89 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dnscrypt-proxy/config.go
View file

@ -612,7 +612,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error {
} }
proxy.routes = &routes proxy.routes = &routes
} }
proxy.skipAnonIncompatbibleResolvers = config.AnonymizedDNS.SkipIncompatible proxy.skipAnonIncompatibleResolvers = config.AnonymizedDNS.SkipIncompatible
proxy.anonDirectCertFallback = config.AnonymizedDNS.DirectCertFallback proxy.anonDirectCertFallback = config.AnonymizedDNS.DirectCertFallback
if config.DoHClientX509AuthLegacy.Creds != nil { if config.DoHClientX509AuthLegacy.Creds != nil {

2
dnscrypt-proxy/example-dnscrypt-proxy.toml
View file

@ -766,6 +766,8 @@ fragments_blocked = ['cisco', 'cisco-ipv6', 'cisco-familyshield', 'cisco-familys
# { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] } # { server_name='example-server-2', via=['sdns://gRIxMzcuNzQuMjIzLjIzNDo0NDM'] }
# ] # ]
routes = { server_name='*', via = ['*'] }
# Skip resolvers incompatible with anonymization instead of using them directly # Skip resolvers incompatible with anonymization instead of using them directly

164
dnscrypt-proxy/proxy.go
View file

@ -19,88 +19,88 @@ import (
) )
type Proxy struct { type Proxy struct {
pluginsGlobals PluginsGlobals pluginsGlobals PluginsGlobals
serversInfo ServersInfo serversInfo ServersInfo
questionSizeEstimator QuestionSizeEstimator questionSizeEstimator QuestionSizeEstimator
registeredServers []RegisteredServer registeredServers []RegisteredServer
dns64Resolvers []string dns64Resolvers []string
dns64Prefixes []string dns64Prefixes []string
serversBlockingFragments []string serversBlockingFragments []string
ednsClientSubnets []*net.IPNet ednsClientSubnets []*net.IPNet
queryLogIgnoredQtypes []string queryLogIgnoredQtypes []string
localDoHListeners []*net.TCPListener localDoHListeners []*net.TCPListener
queryMeta []string queryMeta []string
udpListeners []*net.UDPConn udpListeners []*net.UDPConn
sources []*Source sources []*Source
tcpListeners []*net.TCPListener tcpListeners []*net.TCPListener
registeredRelays []RegisteredServer registeredRelays []RegisteredServer
listenAddresses []string listenAddresses []string
localDoHListenAddresses []string localDoHListenAddresses []string
xTransport *XTransport xTransport *XTransport
dohCreds *map[string]DOHClientCreds dohCreds *map[string]DOHClientCreds
allWeeklyRanges *map[string]WeeklyRanges allWeeklyRanges *map[string]WeeklyRanges
routes *map[string][]string routes *map[string][]string
captivePortalMap *CaptivePortalMap captivePortalMap *CaptivePortalMap
nxLogFormat string nxLogFormat string
localDoHCertFile string localDoHCertFile string
localDoHCertKeyFile string localDoHCertKeyFile string
captivePortalMapFile string captivePortalMapFile string
localDoHPath string localDoHPath string
mainProto string mainProto string
cloakFile string cloakFile string
forwardFile string forwardFile string
blockIPFormat string blockIPFormat string
blockIPLogFile string blockIPLogFile string
allowedIPFile string allowedIPFile string
allowedIPFormat string allowedIPFormat string
allowedIPLogFile string allowedIPLogFile string
queryLogFormat string queryLogFormat string
blockIPFile string blockIPFile string
whitelistNameFormat string whitelistNameFormat string
whitelistNameLogFile string whitelistNameLogFile string
blockNameLogFile string blockNameLogFile string
whitelistNameFile string whitelistNameFile string
blockNameFile string blockNameFile string
queryLogFile string queryLogFile string
blockedQueryResponse string blockedQueryResponse string
userName string userName string
nxLogFile string nxLogFile string
blockNameFormat string blockNameFormat string
proxySecretKey [32]byte proxySecretKey [32]byte
proxyPublicKey [32]byte proxyPublicKey [32]byte
certRefreshDelayAfterFailure time.Duration certRefreshDelayAfterFailure time.Duration
timeout time.Duration timeout time.Duration
certRefreshDelay time.Duration certRefreshDelay time.Duration
cacheSize int cacheSize int
logMaxBackups int logMaxBackups int
logMaxAge int logMaxAge int
logMaxSize int logMaxSize int
cacheNegMinTTL uint32 cacheNegMinTTL uint32
rejectTTL uint32 rejectTTL uint32
cacheMaxTTL uint32 cacheMaxTTL uint32
clientsCount uint32 clientsCount uint32
maxClients uint32 maxClients uint32
cacheMinTTL uint32 cacheMinTTL uint32
cacheNegMaxTTL uint32 cacheNegMaxTTL uint32
cloakTTL uint32 cloakTTL uint32
cache bool cache bool
pluginBlockIPv6 bool pluginBlockIPv6 bool
ephemeralKeys bool ephemeralKeys bool
pluginBlockUnqualified bool pluginBlockUnqualified bool
showCerts bool showCerts bool
certIgnoreTimestamp bool certIgnoreTimestamp bool
skipAnonIncompatbibleResolvers bool skipAnonIncompatibleResolvers bool
anonDirectCertFallback bool anonDirectCertFallback bool
pluginBlockUndelegated bool pluginBlockUndelegated bool
child bool child bool
daemonize bool daemonize bool
requiredProps stamps.ServerInformalProperties requiredProps stamps.ServerInformalProperties
ServerNames []string ServerNames []string
DisabledServerNames []string DisabledServerNames []string
SourceIPv4 bool SourceIPv4 bool
SourceIPv6 bool SourceIPv6 bool
SourceDNSCrypt bool SourceDNSCrypt bool
SourceDoH bool SourceDoH bool
} }
func (proxy *Proxy) registerUDPListener(conn *net.UDPConn) { func (proxy *Proxy) registerUDPListener(conn *net.UDPConn) {

8
dnscrypt-proxy/serversInfo.go
View file

@ -426,11 +426,11 @@ func fetchDNSCryptServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp
} }
if knownBugs.fragmentsBlocked && relay != nil && relay.Dnscrypt != nil { if knownBugs.fragmentsBlocked && relay != nil && relay.Dnscrypt != nil {
relay = nil relay = nil
if proxy.skipAnonIncompatbibleResolvers { if proxy.skipAnonIncompatibleResolvers {
dlog.Infof("[%v] is incompatible with anonymization, it will be ignored", name) dlog.Infof("[%v] couldn't be reached anonymously, it will be ignored", name)
return ServerInfo{}, errors.New("Resolver is incompatible with anonymization") 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 { if err != nil {
return ServerInfo{}, err return ServerInfo{}, err