gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-08 07:41:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

include ipv6 for extclients

Browse source
This commit is contained in:
Matthew R Kasun 2023-02-09 11:20:50 -05:00
parent 0b0db1c0e8
commit 98e66b7292
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
mq/publishers.go
View file

@ -203,15 +203,13 @@ func PublishAllDNS(newnode *models.Node) error {
logger.Log(0, "error retrieving host for dns update", host.ID.String(), err.Error()) logger.Log(0, "error retrieving host for dns update", host.ID.String(), err.Error())
continue continue
} }
dns.Action = models.DNSInsert
dns.Name = host.Name + "." + node.Network
if node.Address.IP != nil { if node.Address.IP != nil {
dns.Action = models.DNSInsert
dns.Name = host.Name + "." + node.Network
dns.Address = node.Address.IP.String() dns.Address = node.Address.IP.String()
alldns = append(alldns, dns) alldns = append(alldns, dns)
} }
if node.Address6.IP != nil { if node.Address6.IP != nil {
dns.Action = models.DNSInsert
dns.Name = host.Name + "." + node.Network
dns.Address = node.Address6.IP.String() dns.Address = node.Address6.IP.String()
alldns = append(alldns, dns) alldns = append(alldns, dns)
} }
@ -223,17 +221,23 @@ func PublishAllDNS(newnode *models.Node) error {
for _, client := range clients { for _, client := range clients {
dns.Action = models.DNSInsert dns.Action = models.DNSInsert
dns.Name = client.ClientID + "." + client.Network dns.Name = client.ClientID + "." + client.Network
dns.Address = client.Address if client.Address != "" {
alldns = append(alldns, dns) dns.Address = client.Address
alldns = append(alldns, dns)
}
if client.Address6 != "" {
dns.Address = client.Address
alldns = append(alldns, dns)
}
} }
entries, err := logic.GetCustomDNS(newnode.Network) customdns, err := logic.GetCustomDNS(newnode.Network)
if err != nil { if err != nil {
logger.Log(0, "error retrieving custom dns entries", err.Error()) logger.Log(0, "error retrieving custom dns entries", err.Error())
} }
for _, entry := range entries { for _, custom := range customdns {
dns.Action = models.DNSInsert dns.Action = models.DNSInsert
dns.Address = entry.Address dns.Address = custom.Address
dns.Name = entry.Name + "." + entry.Network dns.Name = custom.Name + "." + custom.Network
alldns = append(alldns, dns) alldns = append(alldns, dns)
} }
data, err := json.Marshal(alldns) data, err := json.Marshal(alldns)