a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: - autohosts: support tab character

Browse Source 
Close #1686

* commit '2f454117ce7562df934b20c385c11006f8a1cf8f':
  - autohosts: support tab character
This commit is contained in:
Simon Zolin 2020-05-18 19:18:48 +03:00
commit 806f81ede9
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/auto_hosts.go
View File

@ -154,14 +154,21 @@ func (a *AutoHosts) load(table map[string][]net.IP, tableRev map[string]string,
return return
} }
line = strings.TrimSpace(line) line = strings.TrimSpace(line)
if len(line) == 0 || line[0] == '#' {
continue
}
ip := SplitNext(&line, ' ') fields := strings.Fields(line)
ipAddr := net.ParseIP(ip) if len(fields) < 2 {
continue
}
ipAddr := net.ParseIP(fields[0])
if ipAddr == nil { if ipAddr == nil {
continue continue
} }
for { for i := 1; i != len(fields); i++ {
host := SplitNext(&line, ' ') host := fields[i]
if len(host) == 0 { if len(host) == 0 {
break break
} }