Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-27 16:24:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix locking for hosts plugin

Browse Source
This commit is contained in:
Pat Moroney
2017-10-24 10:27:07 -06:00
parent cc490a8912
commit 7ad99d0d36
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/hosts/hostsfile.go
View File

@@ -36,7 +36,7 @@ func absDomainName(b string) string {
// Hostsfile contains known host entries. // Hostsfile contains known host entries.
type Hostsfile struct { type Hostsfile struct {
sync.Mutex sync.RWMutex
// list of zones we are authoritive for // list of zones we are authoritive for
Origins []string Origins []string
@@ -139,6 +139,8 @@ func (h *Hostsfile) Parse(file io.Reader) {
is[addr.String()] = append(is[addr.String()], name) is[addr.String()] = append(is[addr.String()], name)
} }
} }
h.Lock()
defer h.Unlock()
h.byNameV4 = hsv4 h.byNameV4 = hsv4
h.byNameV6 = hsv6 h.byNameV6 = hsv6
h.byAddr = is h.byAddr = is
@@ -159,8 +161,8 @@ func ipVersion(s string) int {
// LookupStaticHostV4 looks up the IPv4 addresses for the given host from the hosts file. // LookupStaticHostV4 looks up the IPv4 addresses for the given host from the hosts file.
func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP { func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP {
h.Lock() h.RLock()
defer h.Unlock() defer h.RUnlock()
h.ReadHosts() h.ReadHosts()
if len(h.byNameV4) != 0 { if len(h.byNameV4) != 0 {
if ips, ok := h.byNameV4[absDomainName(host)]; ok { if ips, ok := h.byNameV4[absDomainName(host)]; ok {
@@ -174,8 +176,8 @@ func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP {
// LookupStaticHostV6 looks up the IPv6 addresses for the given host from the hosts file. // LookupStaticHostV6 looks up the IPv6 addresses for the given host from the hosts file.
func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP { func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP {
h.Lock() h.RLock()
defer h.Unlock() defer h.RUnlock()
h.ReadHosts() h.ReadHosts()
if len(h.byNameV6) != 0 { if len(h.byNameV6) != 0 {
if ips, ok := h.byNameV6[absDomainName(host)]; ok { if ips, ok := h.byNameV6[absDomainName(host)]; ok {
@@ -189,8 +191,8 @@ func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP {
// LookupStaticAddr looks up the hosts for the given address from the hosts file. // LookupStaticAddr looks up the hosts for the given address from the hosts file.
func (h *Hostsfile) LookupStaticAddr(addr string) []string { func (h *Hostsfile) LookupStaticAddr(addr string) []string {
h.Lock() h.RLock()
defer h.Unlock() defer h.RUnlock()
h.ReadHosts() h.ReadHosts()
addr = parseLiteralIP(addr).String() addr = parseLiteralIP(addr).String()
if addr == "" { if addr == "" {