Compare commits

..

3 Commits

Author SHA1 Message Date
6a1c07d3f5 Fixed the way it operates with dublicated DNS records 2025-01-20 01:59:41 +03:00
7270f4c91c Fixed range based for loop 2025-01-19 23:40:55 +03:00
19b44c14d9 Debugging the Set data struct. Fix mistyping 2025-01-19 23:19:56 +03:00
3 changed files with 47 additions and 43 deletions

View File

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

19
go.mod
View File

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

44
set.go
View File

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