devproje/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2024-11-29 18:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Do not return a pointer

Browse source
This commit is contained in:
Juan Font Alonso 2021-10-10 12:43:41 +02:00
parent d70c3d6189
commit 5ce1526a06
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app.go
View file

@ -114,7 +114,7 @@ func NewHeadscale(cfg Config) (*Headscale, error) {
return nil, err return nil, err
} }
h.cfg.DNSConfig.Routes = make(map[string][]dnstype.Resolver) h.cfg.DNSConfig.Routes = make(map[string][]dnstype.Resolver)
for _, d := range *magicDNSDomains { for _, d := range magicDNSDomains {
h.cfg.DNSConfig.Routes[d.WithoutTrailingDot()] = nil h.cfg.DNSConfig.Routes[d.WithoutTrailingDot()] = nil
} }
} }

4
dns.go
View file

@ -28,7 +28,7 @@ import (
// From the netmask we can find out the wildcard bits (the bits that are not set in the netmask). // 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. // 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) base, err := dnsname.ToFQDN(baseDomain)
if err != nil { if err != nil {
return nil, err return nil, err
@ -69,5 +69,5 @@ func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) (
} }
fqdns = append(fqdns, fqdn) fqdns = append(fqdns, fqdn)
} }
return &fqdns, nil return fqdns, nil
} }

10
dns_test.go
View file

@ -11,7 +11,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
found := false found := false
for _, domain := range *domains { for _, domain := range domains {
if domain == "64.100.in-addr.arpa." { if domain == "64.100.in-addr.arpa." {
found = true found = true
break break
@ -20,7 +20,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(found, check.Equals, true) c.Assert(found, check.Equals, true)
found = false found = false
for _, domain := range *domains { for _, domain := range domains {
if domain == "100.100.in-addr.arpa." { if domain == "100.100.in-addr.arpa." {
found = true found = true
break break
@ -29,7 +29,7 @@ func (s *Suite) TestMagicDNSRootDomains100(c *check.C) {
c.Assert(found, check.Equals, true) c.Assert(found, check.Equals, true)
found = false found = false
for _, domain := range *domains { for _, domain := range domains {
if domain == "127.100.in-addr.arpa." { if domain == "127.100.in-addr.arpa." {
found = true found = true
break break
@ -44,7 +44,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) {
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
found := false found := false
for _, domain := range *domains { for _, domain := range domains {
if domain == "0.16.172.in-addr.arpa." { if domain == "0.16.172.in-addr.arpa." {
found = true found = true
break break
@ -53,7 +53,7 @@ func (s *Suite) TestMagicDNSRootDomains172(c *check.C) {
c.Assert(found, check.Equals, true) c.Assert(found, check.Equals, true)
found = false found = false
for _, domain := range *domains { for _, domain := range domains {
if domain == "255.16.172.in-addr.arpa." { if domain == "255.16.172.in-addr.arpa." {
found = true found = true
break break