TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-07 10:40:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

边缘节点IP支持IPV6

Browse Source
This commit is contained in:
刘祥超
2021-06-07 10:02:07 +08:00
parent 111df18204
commit 05ce1d327b
5 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/tasks/dns_task_executor.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/TeaOSLab/EdgeAPI/internal/dnsclients"
"github.com/TeaOSLab/EdgeAPI/internal/dnsclients/dnstypes"
"github.com/TeaOSLab/EdgeAPI/internal/remotelogs"
"github.com/TeaOSLab/EdgeAPI/internal/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/lists"
@@ -278,7 +279,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error {
}
oldRecordsMap := map[string]*dnstypes.Record{} // route@value => record
for _, record := range records {
if record.Type == dnstypes.RecordTypeA && record.Name == clusterDNSName {
if (record.Type == dnstypes.RecordTypeA || record.Type == dnstypes.RecordTypeAAAA) && record.Name == clusterDNSName {
key := record.Route + "@" + record.Value
oldRecordsMap[key] = record
}
@@ -310,7 +311,7 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error {
}
for _, ipAddress := range ipAddresses {
ip := ipAddress.Ip
if len(ip) == 0 {
if len(ip) == 0 || ipAddress.CanAccess == 0 {
continue
}
if net.ParseIP(ip) == nil {
@@ -324,10 +325,14 @@ func (this *DNSTaskExecutor) doCluster(taskId int64, clusterId int64) error {
continue
}
recordType := dnstypes.RecordTypeA
if utils.IsIPv6(ip) {
recordType = dnstypes.RecordTypeAAAA
}
err = manager.AddRecord(domain, &dnstypes.Record{
Id: "",
Name: clusterDNSName,
Type: dnstypes.RecordTypeA,
Type: recordType,
Value: ip,
Route: route,
})