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

dnsforward -- fix panic on ANY request

This commit is contained in:
Eugene Bujak 2018-12-06 16:55:05 +03:00
parent c82a5ac0cb
commit 15f3c82238
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnsforward/querylog_top.go
View File

@ -168,7 +168,7 @@ func (r *dayTop) addEntry(entry *logEntry, q *dns.Msg, now time.Time) error {
return err return err
} }
if entry.Result.IsFiltered { if entry.Result != nil && entry.Result.IsFiltered {
err := runningTop.hours[hour].incrementBlocked(hostname) err := runningTop.hours[hour].incrementBlocked(hostname)
if err != nil { if err != nil {
log.Printf("Failed to increment value: %s", err) log.Printf("Failed to increment value: %s", err)

39
dnsforward/stats.go
View File

@ -193,24 +193,27 @@ func (h *histogram) Observe(value float64) {
// ----- // -----
func incrementCounters(entry *logEntry) { func incrementCounters(entry *logEntry) {
requests.IncWithTime(entry.Time) requests.IncWithTime(entry.Time)
if entry.Result.IsFiltered { if entry.Result != nil {
filtered.IncWithTime(entry.Time) if entry.Result.IsFiltered {
} filtered.IncWithTime(entry.Time)
switch entry.Result.Reason { }
case dnsfilter.NotFilteredWhiteList:
whitelisted.IncWithTime(entry.Time) switch entry.Result.Reason {
case dnsfilter.NotFilteredError: case dnsfilter.NotFilteredWhiteList:
errorsTotal.IncWithTime(entry.Time) whitelisted.IncWithTime(entry.Time)
case dnsfilter.FilteredBlackList: case dnsfilter.NotFilteredError:
filteredLists.IncWithTime(entry.Time) errorsTotal.IncWithTime(entry.Time)
case dnsfilter.FilteredSafeBrowsing: case dnsfilter.FilteredBlackList:
filteredSafebrowsing.IncWithTime(entry.Time) filteredLists.IncWithTime(entry.Time)
case dnsfilter.FilteredParental: case dnsfilter.FilteredSafeBrowsing:
filteredParental.IncWithTime(entry.Time) filteredSafebrowsing.IncWithTime(entry.Time)
case dnsfilter.FilteredInvalid: case dnsfilter.FilteredParental:
// do nothing filteredParental.IncWithTime(entry.Time)
case dnsfilter.FilteredSafeSearch: case dnsfilter.FilteredInvalid:
safesearch.IncWithTime(entry.Time) // do nothing
case dnsfilter.FilteredSafeSearch:
safesearch.IncWithTime(entry.Time)
}
} }
elapsedTime.ObserveWithTime(entry.Elapsed.Seconds(), entry.Time) elapsedTime.ObserveWithTime(entry.Elapsed.Seconds(), entry.Time)
} }