Compare commits

..

No commits in common. "main" and "v0.0.6-debug" have entirely different histories.

3 changed files with 47 additions and 41 deletions

View File

@ -34,6 +34,17 @@ type dnsexitDTO struct {
Delete *dns.Record `json:"delete,omitempty"` Delete *dns.Record `json:"delete,omitempty"`
} }
func convertInterfaceSliceToStruct(slice []interface{}) *[]dns.Domain {
var domains []dns.Domain
for _, domain := range slice {
fmt.Println(domain)
}
return &domains
}
func (c *client) AddRecord(rec *dns.Record) (error, *dns.Response) { func (c *client) AddRecord(rec *dns.Record) (error, *dns.Response) {
c.Locker.Lock() c.Locker.Lock()
defer c.Locker.Unlock() defer c.Locker.Unlock()
@ -131,8 +142,8 @@ func (c *client) UpdateRecord(rec *dns.Record) (error, *dns.Response) {
return nil, &dns.Response{Message: string(body)} return nil, &dns.Response{Message: string(body)}
} }
func (c *client) GetRecords() (error, *[]dns.Record) { func (c *client) GetRecords() (error, []*dns.Record) {
var subdomains = NewRecordSet() var subdomains = CreateSet()
var wg sync.WaitGroup var wg sync.WaitGroup
result_chan := make(chan []*dns.Record) result_chan := make(chan []*dns.Record)
@ -169,13 +180,13 @@ func (c *client) GetRecords() (error, *[]dns.Record) {
select { select {
case records, ok := <-result_chan: case records, ok := <-result_chan:
if !ok { if !ok {
return nil, subdomains.List() return nil, convertInterfaceSliceToStruct(subdomains.List())
} }
for _, record := range records { for record := range records {
subdomains.Add(record) subdomains.Add(record)
} }
case _, _ = <-err_chan: case _, _ = <-err_chan:
} }
} }

19
go.mod
View File

@ -3,14 +3,11 @@ module git.uoc.run.place/OxFF/dnsexit-manager
go 1.23.4 go 1.23.4
require ( require (
git.uoc.run.place/OxFF/dns-manager v0.0.2 git.uoc.run.place/OxFF/dns-manager v0.0.0-20250107205730-c4ab438a9fd5 // indirect
github.com/miekg/dns v1.1.62 github.com/miekg/dns v1.1.62 // indirect
) golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.27.0 // indirect
require ( golang.org/x/sync v0.7.0 // indirect
golang.org/x/mod v0.22.0 // indirect golang.org/x/sys v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect golang.org/x/tools v0.22.0 // indirect
golang.org/x/sync v0.10.0 // indirect )
golang.org/x/sys v0.29.0 // indirect
golang.org/x/tools v0.29.0 // indirect
)

42
set.go
View File

@ -1,35 +1,33 @@
package dnsexit_manager package dnsexit_manager
import dns "git.uoc.run.place/OxFF/dns-manager"
type RecordSet struct { type Set struct {
records map[dns.Record]struct{} elements map[interface{}]struct{}
} }
func NewRecordSet() *RecordSet { func CreateSet() *Set {
return &RecordSet{ return &Set{
records: make(map[dns.Record]struct{}), elements: make(map[interface{}]struct{}),
} }
} }
func (s *RecordSet) Add(record *dns.Record) { func (set *Set) Add(value interface{}) {
s.records[*record] = struct{}{} _, found := set.elements[value]
if !found{
set.elements[value] = struct{}{}
}
} }
func (s *RecordSet) Remove(record dns.Record) { func (set *Set) Delete(value interface{}) {
delete(s.records, record) delete(set.elements, value)
} }
func (s *RecordSet) Contains(record *dns.Record) bool { func (set *Set) List() []interface{} {
_, exists := s.records[*record] keys := make([]interface{}, 0, len(set.elements))
return exists for key := range set.elements {
} keys = append(keys, key)
}
func (s *RecordSet) List() *[]dns.Record { return keys
records := make([]dns.Record, 0, len(s.records))
for record := range s.records {
records = append(records, record)
}
return &records
} }