From cc3786b919d887e31166e9fd4ed4c7d32c7953dd Mon Sep 17 00:00:00 2001 From: Armen Boursalian Date: Sun, 30 Dec 2018 19:07:05 -0800 Subject: [PATCH 1/2] Fix ignored err check in RunRule --- daemon/firewall/rules.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daemon/firewall/rules.go b/daemon/firewall/rules.go index 3e1617eb..b6eef179 100644 --- a/daemon/firewall/rules.go +++ b/daemon/firewall/rules.go @@ -27,6 +27,9 @@ func RunRule(enable bool, rule []string) (err error) { // fmt.Printf("iptables %s\n", rule) _, err = core.Exec("iptables", rule) + if err != nil { + return + } _, err = core.Exec("ip6tables", rule) return From ba00f91bde02efd829cf822d7db12dba9957652c Mon Sep 17 00:00:00 2001 From: Northern-Lights Date: Sat, 26 Jan 2019 20:56:12 -0800 Subject: [PATCH 2/2] Fix QueueDNSResponses to include ip6tables --- daemon/firewall/rules.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/daemon/firewall/rules.go b/daemon/firewall/rules.go index b6eef179..4378b866 100644 --- a/daemon/firewall/rules.go +++ b/daemon/firewall/rules.go @@ -31,6 +31,9 @@ func RunRule(enable bool, rule []string) (err error) { return } _, err = core.Exec("ip6tables", rule) + if err != nil { + return + } return } @@ -51,9 +54,19 @@ func QueueDNSResponses(enable bool, queueNum int) (err error) { "--queue-num", fmt.Sprintf("%d", queueNum), "--queue-bypass", } + lock.Lock() defer lock.Unlock() + _, err := core.Exec("iptables", rule) + if err != nil { + return err + } + _, err = core.Exec("ip6tables", rule) + if err != nil { + return err + } + return err }