extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-03-06 02:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename unregister method

Browse Source
This commit is contained in:
Viktor Liu 2024-12-12 12:03:57 +01:00
parent 59df951a86
commit a13cdfa46c
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/internal/dns/server.go
View File

@ -38,7 +38,7 @@ type Server interface {
OnUpdatedHostDNSServer(strings []string) OnUpdatedHostDNSServer(strings []string)
SearchDomains() []string SearchDomains() []string
ProbeAvailability() ProbeAvailability()
UnregisterHandler(domains []string) error DeregisterHandler(domains []string) error
} }
type registeredHandlerMap map[string]handlerWithStop type registeredHandlerMap map[string]handlerWithStop
@ -167,7 +167,7 @@ func (s *DefaultServer) RegisterHandler(domains []string, handler dns.Handler) e
return nil return nil
} }
func (s *DefaultServer) UnregisterHandler(domains []string) error { func (s *DefaultServer) DeregisterHandler(domains []string) error {
s.mux.Lock() s.mux.Lock()
defer s.mux.Unlock() defer s.mux.Unlock()

3
client/internal/engine_test.go
View File

@ -13,6 +13,7 @@ import (
"time" "time"
"github.com/google/uuid" "github.com/google/uuid"
miekdns "github.com/miekg/dns"
"github.com/pion/transport/v3/stdnet" "github.com/pion/transport/v3/stdnet"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -103,6 +104,8 @@ func TestEngine_SSH(t *testing.T) {
engine.dnsServer = &dns.MockServer{ 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 var sshKeysAdded []string

2
client/internal/routemanager/dnsinterceptor/handler.go
View File

@ -91,7 +91,7 @@ func (d *DnsInterceptor) RemoveRoute() error {
clear(d.interceptedDomains) 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)) merr = multierror.Append(merr, fmt.Errorf("unregister DNS handler: %v", err))
} }