Compare commits
No commits in common. "6a1c07d3f50f5362d5312901237e3034de80bca0" and "05e035925f712be097d4f907eef58bf3ec7a59ae" have entirely different histories.
6a1c07d3f5
...
05e035925f
@ -35,15 +35,16 @@ type dnsexitDTO struct {
|
||||
}
|
||||
|
||||
func convertInterfaceSliceToStruct(slice []interface{}) *[]dns.Record {
|
||||
var domains []dns.Record
|
||||
var domains []dns.Record
|
||||
|
||||
for k, domain := range slice {
|
||||
fmt.Println(k, domain)
|
||||
}
|
||||
for _, domain := range slice {
|
||||
fmt.Println(domain)
|
||||
}
|
||||
|
||||
return &domains
|
||||
return &domains
|
||||
}
|
||||
|
||||
|
||||
func (c *client) AddRecord(rec *dns.Record) (error, *dns.Response) {
|
||||
c.Locker.Lock()
|
||||
defer c.Locker.Unlock()
|
||||
@ -141,8 +142,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 = NewRecordSet()
|
||||
func (c *client) GetRecords() (error, []*dns.Record) {
|
||||
var subdomains = CreateSet()
|
||||
var wg sync.WaitGroup
|
||||
|
||||
result_chan := make(chan []*dns.Record)
|
||||
@ -179,13 +180,13 @@ func (c *client) GetRecords() (error, *[]dns.Record) {
|
||||
select {
|
||||
case records, ok := <-result_chan:
|
||||
if !ok {
|
||||
return nil, subdomains.List()
|
||||
return nil, convertInterfaceSliceToStruct(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
19
go.mod
@ -3,14 +3,11 @@ module git.uoc.run.place/OxFF/dnsexit-manager
|
||||
go 1.23.4
|
||||
|
||||
require (
|
||||
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
|
||||
)
|
||||
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
|
||||
)
|
42
set.go
42
set.go
@ -1,35 +1,33 @@
|
||||
package dnsexit_manager
|
||||
|
||||
import dns "git.uoc.run.place/OxFF/dns-manager"
|
||||
|
||||
type RecordSet struct {
|
||||
records map[dns.Record]struct{}
|
||||
type Set struct {
|
||||
elements map[interface{}]struct{}
|
||||
}
|
||||
|
||||
func NewRecordSet() *RecordSet {
|
||||
return &RecordSet{
|
||||
records: make(map[dns.Record]struct{}),
|
||||
}
|
||||
func CreateSet() *Set {
|
||||
return &Set{
|
||||
elements: make(map[interface{}]struct{}),
|
||||
}
|
||||
}
|
||||
|
||||
func (s *RecordSet) Add(record *dns.Record) {
|
||||
s.records[*record] = struct{}{}
|
||||
func (set *Set) Add(value interface{}) {
|
||||
_, found := set.elements[value]
|
||||
|
||||
if !found{
|
||||
set.elements[value] = struct{}{}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *RecordSet) Remove(record dns.Record) {
|
||||
delete(s.records, record)
|
||||
func (set *Set) Delete(value interface{}) {
|
||||
delete(set.elements, value)
|
||||
}
|
||||
|
||||
func (s *RecordSet) Contains(record *dns.Record) bool {
|
||||
_, exists := s.records[*record]
|
||||
return exists
|
||||
}
|
||||
func (set *Set) List() []interface{} {
|
||||
keys := make([]interface{}, 0, len(set.elements))
|
||||
for key := range set.elements {
|
||||
keys = append(keys, key)
|
||||
}
|
||||
|
||||
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
|
||||
return keys
|
||||
}
|
||||
|
Reference in New Issue
Block a user