Add recover-iptables sub-comment. Fixes #6

cmds/portmaster-start/recover_linux.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"github.com/safing/portmaster/firewall/interception"
+	"github.com/spf13/cobra"
+)
+
+var recoverIPTablesCmd = &cobra.Command{
+	Use:   "recover-iptables",
+	Short: "Removes obsolete IP tables rules in case of an unclean shutdown",
+	RunE: func(*cobra.Command, []string) error {
+		return interception.DeactivateNfqueueFirewall()
+	},
+	SilenceUsage: true,
+}
+
+func init() {
+	rootCmd.AddCommand(recoverIPTablesCmd)
+}

firewall/interception/nfqueue_linux.go

@@ -179,7 +179,8 @@ func activateNfqueueFirewall() error {
 	return nil
 }
 
-func deactivateNfqueueFirewall() error {
+// DeactivateNfqueueFirewall drops portmaster related IP tables rules.
+func DeactivateNfqueueFirewall() error {
 	// IPv4
 	ip4tables, err := iptables.NewWithProtocol(iptables.ProtocolIPv4)
 	if err != nil {
@@ -293,7 +294,7 @@ func StopNfqueueInterception() error {
 		in6Queue.Destroy()
 	}
 
-	err := deactivateNfqueueFirewall()
+	err := DeactivateNfqueueFirewall()
 	if err != nil {
 		return fmt.Errorf("interception: error while deactivating nfqueue: %s", err)
 	}