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

Rename negTTL to rejectTTL to avoid confusion with cacheNegTTL

This commit is contained in:
Frank Denis 2019-10-21 18:26:49 +02:00
parent bb01595320
commit a26b2b42f0
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dnscrypt-proxy/config.go
View File

@ -52,7 +52,7 @@ type Config struct {
CacheNegMaxTTL uint32 `toml:"cache_neg_max_ttl"` CacheNegMaxTTL uint32 `toml:"cache_neg_max_ttl"`
CacheMinTTL uint32 `toml:"cache_min_ttl"` CacheMinTTL uint32 `toml:"cache_min_ttl"`
CacheMaxTTL uint32 `toml:"cache_max_ttl"` CacheMaxTTL uint32 `toml:"cache_max_ttl"`
NegTTL uint32 `toml:"neg_ttl"` RejectTTL uint32 `toml:"reject_ttl"`
CloakTTL uint32 `toml:"cloak_ttl"` CloakTTL uint32 `toml:"cloak_ttl"`
QueryLog QueryLogConfig `toml:"query_log"` QueryLog QueryLogConfig `toml:"query_log"`
NxLog NxLogConfig `toml:"nx_log"` NxLog NxLogConfig `toml:"nx_log"`
@ -105,7 +105,7 @@ func newConfig() Config {
CacheNegMaxTTL: 600, CacheNegMaxTTL: 600,
CacheMinTTL: 60, CacheMinTTL: 60,
CacheMaxTTL: 86400, CacheMaxTTL: 86400,
NegTTL: 600, RejectTTL: 600,
CloakTTL: 600, CloakTTL: 600,
SourceRequireNoLog: true, SourceRequireNoLog: true,
SourceRequireNoFilter: true, SourceRequireNoFilter: true,
@ -369,7 +369,7 @@ func ConfigLoad(proxy *Proxy, svcFlag *string) error {
proxy.cacheMinTTL = config.CacheMinTTL proxy.cacheMinTTL = config.CacheMinTTL
proxy.cacheMaxTTL = config.CacheMaxTTL proxy.cacheMaxTTL = config.CacheMaxTTL
proxy.negTTL = config.NegTTL proxy.rejectTTL = config.RejectTTL
proxy.cloakTTL = config.CloakTTL proxy.cloakTTL = config.CloakTTL
proxy.queryMeta = config.QueryMeta proxy.queryMeta = config.QueryMeta

8
dnscrypt-proxy/example-dnscrypt-proxy.toml
View File

@ -266,6 +266,12 @@ log_files_max_backups = 1
block_ipv6 = false block_ipv6 = false
## TTL for synthetic responses sent when a request has been blocked (due to
## IPv6 or blacklists).
reject_ttl = 600
################################################################################## ##################################################################################
# Route queries for specific domains to a dedicated set of servers # # Route queries for specific domains to a dedicated set of servers #
@ -331,9 +337,7 @@ cache_neg_min_ttl = 60
cache_neg_max_ttl = 600 cache_neg_max_ttl = 600
## TTL when dnscryp-proxy does reject entry
# neg_ttl = 600
############################### ###############################
# Query logging # # Query logging #

8
dnscrypt-proxy/plugins.go
View File

@ -76,7 +76,7 @@ type PluginsState struct {
cacheNegMaxTTL uint32 cacheNegMaxTTL uint32
cacheMinTTL uint32 cacheMinTTL uint32
cacheMaxTTL uint32 cacheMaxTTL uint32
negTTL uint32 rejectTTL uint32
questionMsg *dns.Msg questionMsg *dns.Msg
requestStart time.Time requestStart time.Time
requestEnd time.Time requestEnd time.Time
@ -222,7 +222,7 @@ func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr, sta
cacheNegMaxTTL: proxy.cacheNegMaxTTL, cacheNegMaxTTL: proxy.cacheNegMaxTTL,
cacheMinTTL: proxy.cacheMinTTL, cacheMinTTL: proxy.cacheMinTTL,
cacheMaxTTL: proxy.cacheMaxTTL, cacheMaxTTL: proxy.cacheMaxTTL,
negTTL: proxy.negTTL, rejectTTL: proxy.rejectTTL,
questionMsg: nil, questionMsg: nil,
requestStart: start, requestStart: start,
maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize, maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize,
@ -251,7 +251,7 @@ func (pluginsState *PluginsState) ApplyQueryPlugins(pluginsGlobals *PluginsGloba
return packet, err return packet, err
} }
if pluginsState.action == PluginsActionReject { if pluginsState.action == PluginsActionReject {
synth, err := RefusedResponseFromMessage(&msg, pluginsGlobals.refusedCodeInResponses, pluginsGlobals.respondWithIPv4, pluginsGlobals.respondWithIPv6, pluginsState.negTTL) synth, err := RefusedResponseFromMessage(&msg, pluginsGlobals.refusedCodeInResponses, pluginsGlobals.respondWithIPv4, pluginsGlobals.respondWithIPv6, pluginsState.rejectTTL)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -298,7 +298,7 @@ func (pluginsState *PluginsState) ApplyResponsePlugins(pluginsGlobals *PluginsGl
return packet, err return packet, err
} }
if pluginsState.action == PluginsActionReject { if pluginsState.action == PluginsActionReject {
synth, err := RefusedResponseFromMessage(&msg, pluginsGlobals.refusedCodeInResponses, pluginsGlobals.respondWithIPv4, pluginsGlobals.respondWithIPv6, pluginsState.negTTL) synth, err := RefusedResponseFromMessage(&msg, pluginsGlobals.refusedCodeInResponses, pluginsGlobals.respondWithIPv4, pluginsGlobals.respondWithIPv6, pluginsState.rejectTTL)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
dnscrypt-proxy/proxy.go
View File

@ -41,7 +41,7 @@ type Proxy struct {
cacheNegMaxTTL uint32 cacheNegMaxTTL uint32
cacheMinTTL uint32 cacheMinTTL uint32
cacheMaxTTL uint32 cacheMaxTTL uint32
negTTL uint32 rejectTTL uint32
cloakTTL uint32 cloakTTL uint32
queryLogFile string queryLogFile string
queryLogFormat string queryLogFormat string