From a13cdfa46ca26b1d6ca1d84318a71f2b77ce9110 Mon Sep 17 00:00:00 2001
From: Viktor Liu <viktor@netbird.io>
Date: Thu, 12 Dec 2024 12:03:57 +0100
Subject: [PATCH] Rename unregister method

---
 client/internal/dns/server.go                          | 4 ++--
 client/internal/engine_test.go                         | 5 ++++-
 client/internal/routemanager/dnsinterceptor/handler.go | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go
index ff9ebc00a..aa96f2306 100644
--- a/client/internal/dns/server.go
+++ b/client/internal/dns/server.go
@@ -38,7 +38,7 @@ type Server interface {
 	OnUpdatedHostDNSServer(strings []string)
 	SearchDomains() []string
 	ProbeAvailability()
-	UnregisterHandler(domains []string) error
+	DeregisterHandler(domains []string) error
 }
 
 type registeredHandlerMap map[string]handlerWithStop
@@ -167,7 +167,7 @@ func (s *DefaultServer) RegisterHandler(domains []string, handler dns.Handler) e
 	return nil
 }
 
-func (s *DefaultServer) UnregisterHandler(domains []string) error {
+func (s *DefaultServer) DeregisterHandler(domains []string) error {
 	s.mux.Lock()
 	defer s.mux.Unlock()
 
diff --git a/client/internal/engine_test.go b/client/internal/engine_test.go
index 4a8f369b6..f4625fee2 100644
--- a/client/internal/engine_test.go
+++ b/client/internal/engine_test.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	miekdns "github.com/miekg/dns"
 	"github.com/pion/transport/v3/stdnet"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
@@ -102,7 +103,9 @@ func TestEngine_SSH(t *testing.T) {
 	)
 
 	engine.dnsServer = &dns.MockServer{
-		UpdateDNSServerFunc: func(serial uint64, update nbdns.Config) error { return nil },
+		UpdateDNSServerFunc:   func(serial uint64, update nbdns.Config) error { return nil },
+		RegisterHandlerFunc:   func(domains []string, handler miekdns.Handler) error { return nil },
+		DeregisterHandlerFunc: func(domains []string) error { return nil },
 	}
 
 	var sshKeysAdded []string
diff --git a/client/internal/routemanager/dnsinterceptor/handler.go b/client/internal/routemanager/dnsinterceptor/handler.go
index 76e644974..d384c2941 100644
--- a/client/internal/routemanager/dnsinterceptor/handler.go
+++ b/client/internal/routemanager/dnsinterceptor/handler.go
@@ -91,7 +91,7 @@ func (d *DnsInterceptor) RemoveRoute() error {
 
 	clear(d.interceptedDomains)
 
-	if err := d.dnsServer.UnregisterHandler(d.route.Domains.ToPunycodeList()); err != nil {
+	if err := d.dnsServer.DeregisterHandler(d.route.Domains.ToPunycodeList()); err != nil {
 		merr = multierror.Append(merr, fmt.Errorf("unregister DNS handler: %v", err))
 	}