diff --git a/util/dhcp.go b/dns/dhcp.go similarity index 99% rename from util/dhcp.go rename to dns/dhcp.go index 636d1d4..35abc15 100644 --- a/util/dhcp.go +++ b/dns/dhcp.go @@ -1,4 +1,4 @@ -package util +package dns import ( "math/rand" diff --git a/util/dhcp_test.go b/dns/dhcp_test.go similarity index 96% rename from util/dhcp_test.go rename to dns/dhcp_test.go index 8538e6f..94d6f94 100644 --- a/util/dhcp_test.go +++ b/dns/dhcp_test.go @@ -1,4 +1,4 @@ -package util +package dns import "testing" diff --git a/dns/dns.go b/dns/dns.go index cba031c..54cb6b0 100644 --- a/dns/dns.go +++ b/dns/dns.go @@ -10,7 +10,6 @@ import ( "github.com/miekg/dns" mem "github.com/wweir/mem-go" "github.com/wweir/sower/conf" - "github.com/wweir/sower/util" ) const colon = byte(':') @@ -28,7 +27,7 @@ func StartDNS(dnsServer, listenIP string) { go func() { for { <-dhcpCh - host := util.GetDefaultDNSServer() + host := GetDefaultDNSServer() if host == "" { continue } @@ -108,24 +107,24 @@ func (i *intelliSuggest) GetOne(domain interface{}) (iface interface{}, e error) } // give local dial a hand, make it not so easy to be added into suggestions - util.HTTPPing(addr, addr, util.Http, i.timeout/20) + HTTPPing(addr, addr, Http, i.timeout/20) var ( pings = []struct { viaAddr string - port util.Port + port Port }{ - {addr, util.Http}, - {addr, util.Https}, - {i.listenIP, util.Http}, - {i.listenIP, util.Https}, + {addr, Http}, + {addr, Https}, + {i.listenIP, Http}, + {i.listenIP, Https}, } half = int32(len(pings) / 2) score = new(int32) ) for idx := range pings { go func(idx int) { - err := util.HTTPPing(pings[idx].viaAddr, addr, pings[idx].port, i.timeout) + err := HTTPPing(pings[idx].viaAddr, addr, pings[idx].port, i.timeout) if err != nil { // local ping fail if pings[idx].viaAddr == addr { diff --git a/util/http_ping.go b/dns/http_ping.go similarity index 99% rename from util/http_ping.go rename to dns/http_ping.go index 5acc4ad..8e72468 100644 --- a/util/http_ping.go +++ b/dns/http_ping.go @@ -1,4 +1,4 @@ -package util +package dns import ( "bytes"