Move Filter definition from dnsforward to dnsfilter, it belongs there.

This commit is contained in:
Eugene Bujak
2018-11-30 13:24:42 +03:00
parent a6e0a17454
commit 87c54ebd4c
5 changed files with 18 additions and 16 deletions

View File

@@ -5,6 +5,7 @@ import (
"log"
"net"
"github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/joomcode/errorx"
)
@@ -16,14 +17,14 @@ func isRunning() bool {
}
func generateServerConfig() dnsforward.ServerConfig {
filters := []dnsforward.Filter{}
filters := []dnsfilter.Filter{}
userFilter := userFilter()
filters = append(filters, dnsforward.Filter{
filters = append(filters, dnsfilter.Filter{
ID: userFilter.ID,
Rules: userFilter.Rules,
})
for _, filter := range config.Filters {
filters = append(filters, dnsforward.Filter{
filters = append(filters, dnsfilter.Filter{
ID: filter.ID,
Rules: filter.Rules,
})