dns recursive resolver(iterative, root hints, delegfation, glue, fallback), adblocker, dns cache

1 files changed, 7 insertions, 2 deletions

diff --git a/internal/server/server.go b/internal/server/server.go
index 3114073..e0490bd 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -8,18 +8,23 @@ import (
 
 	"github.com/miekg/dns"
 	"sdns/internal/resolver"
+	"sdns/internal/blocklist"
+	"sdns/internal/cache"
 )
 
 type Server struct {
 	logger   *slog.Logger
 	resolver *resolver.Resolver
+	cache *cache.Cache
+	blocklist *blocklist.Blocklist
 	udp      *dns.Server
 	tcp      *dns.Server
 	doh      *http.Server
 }
 
-func New(udpAddr, tcpAddr, dohAddr string, logger *slog.Logger, r *resolver.Resolver) (*Server, error) {
-	s := &Server{logger: logger, resolver: r}
+func New(udpAddr, tcpAddr, dohAddr string, logger *slog.Logger,
+r *resolver.Resolver, c *cache.Cache, b *blocklist.Blocklist) (*Server, error) {
+	s := &Server{logger: logger, resolver: r, cache: c, blocklist: b}
 	mux := dns.NewServeMux()
 	mux.HandleFunc(".", s.handleQuery)