Skip to content

Commit

Permalink
Do not return a pointer
Browse files Browse the repository at this point in the history
  • Loading branch information
juanfont committed Oct 10, 2021
1 parent d70c3d6 commit 5ce1526
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func NewHeadscale(cfg Config) (*Headscale, error) {
return nil, err
}
h.cfg.DNSConfig.Routes = make(map[string][]dnstype.Resolver)
for _, d := range *magicDNSDomains {
for _, d := range magicDNSDomains {
h.cfg.DNSConfig.Routes[d.WithoutTrailingDot()] = nil
}
}
Expand Down
4 changes: 2 additions & 2 deletions dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

// From the netmask we can find out the wildcard bits (the bits that are not set in the netmask).
// This allows us to then calculate the subnets included in the subsequent class block and generate the entries.
func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) (*[]dnsname.FQDN, error) {
func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) ([]dnsname.FQDN, error) {
base, err := dnsname.ToFQDN(baseDomain)
if err != nil {
return nil, err
Expand Down Expand Up @@ -69,5 +69,5 @@ func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) (
}
fqdns = append(fqdns, fqdn)
}
return &fqdns, nil
return fqdns, nil
}
10 changes: 5 additions & 5 deletions dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(err, check.IsNil)

found := false
for _, domain := range *domains {
for _, domain := range domains {
if domain == "64.100.in-addr.arpa." {
found = true
break
Expand All @@ -20,7 +20,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(found, check.Equals, true)

found = false
for _, domain := range *domains {
for _, domain := range domains {
if domain == "100.100.in-addr.arpa." {
found = true
break
Expand All @@ -29,7 +29,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(found, check.Equals, true)

found = false
for _, domain := range *domains {
for _, domain := range domains {
if domain == "127.100.in-addr.arpa." {
found = true
break
Expand All @@ -44,7 +44,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) {
c.Assert(err, check.IsNil)

found := false
for _, domain := range *domains {
for _, domain := range domains {
if domain == "0.16.172.in-addr.arpa." {
found = true
break
Expand All @@ -53,7 +53,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) {
c.Assert(found, check.Equals, true)

found = false
for _, domain := range *domains {
for _, domain := range domains {
if domain == "255.16.172.in-addr.arpa." {
found = true
break
Expand Down

0 comments on commit 5ce1526

Please sign in to comment.