daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsforward/ipset: factor ipset command execution out of ipset processing

Browse Source
This commit is contained in:
David Sheets
2020-10-06 16:34:06 +01:00
parent 78814064bd
commit 042171d1a1
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dnsforward/ipset.go
View File

@@ -89,8 +89,22 @@ func (c *ipsetCtx) getIP(rr dns.RR) net.IP {
} }
} }
// Add IP addresses of the specified in configuration domain names to an ipset list func addToIpset(host string, ipsetName string, ipStr string) {
func (c *ipsetCtx) process(ctx *dnsContext) int { code, out, err := util.RunCommand("ipset", "add", ipsetName, ipStr)
if err != nil {
log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, ipsetName, err)
return
}
if code != 0 {
log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
return
}
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, ipsetName)
}
// Compute which addresses to add to which ipsets for a particular DNS query response
// Call addMember for each (host, ipset, ip) triple
func (c *ipsetCtx) processMembers(ctx *dnsContext, addMember func(string, string, string)) int {
req := ctx.proxyCtx.Req req := ctx.proxyCtx.Req
if !(req.Question[0].Qtype == dns.TypeA || if !(req.Question[0].Qtype == dns.TypeA ||
req.Question[0].Qtype == dns.TypeAAAA) || req.Question[0].Qtype == dns.TypeAAAA) ||
@@ -116,18 +130,14 @@ func (c *ipsetCtx) process(ctx *dnsContext) int {
ipStr := ip.String() ipStr := ip.String()
for _, name := range ipsetNames { for _, name := range ipsetNames {
code, out, err := util.RunCommand("ipset", "add", name, ipStr) addMember(host, name, ipStr)
if err != nil {
log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err)
continue
}
if code != 0 {
log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
continue
}
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
} }
} }
return resultDone return resultDone
} }
// Add IP addresses of the specified in configuration domain names to an ipset list
func (c *ipsetCtx) process(ctx *dnsContext) int {
return c.processMembers(ctx, addToIpset)
}