summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2018-07-17 13:49:46 +0200
committerRuben Pollan <meskio@sindominio.net>2018-07-18 10:37:18 +0200
commitfff377679471def36b340fa06d4f8e054ca36426 (patch)
treef5c8ea23b3c404a02a87d2fe0d19832628ebf530
parent4d1be548c357b1c1e78a4ae1c844b5ffaa5025c9 (diff)
[pkg] don't hung if OSX firewall is not up
On reseting the gateway table we should not hung if the table doesn't exist. Let's just print a log message.
-rw-r--r--helper/darwin.go2
-rw-r--r--helper/helper.go1
2 files changed, 2 insertions, 1 deletions
diff --git a/helper/darwin.go b/helper/darwin.go
index 733eaf1..33a69fc 100644
--- a/helper/darwin.go
+++ b/helper/darwin.go
@@ -106,7 +106,7 @@ func resetGatewaysTable(gateways []string) error {
cmd := exec.Command(pfctl, "-a", bitmask_anchor, "-t", gateways_table, "-T", "delete")
err := cmd.Run()
if err != nil {
- return err
+ log.Printf("Can't delete table: %v", err)
}
for _, gateway := range gateways {
diff --git a/helper/helper.go b/helper/helper.go
index 1b7033a..9f09e81 100644
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -123,6 +123,7 @@ func firewallStartHandler(w http.ResponseWriter, r *http.Request) {
if err != nil {
log.Printf("Error starting firewall: %v", err)
w.Write([]byte(err.Error()))
+ return
}
log.Println("Start firewall: firewall started")
}