Browse Source

flush tables vice delete rules for nft

Matthew R. Kasun 3 years ago
parent
commit
e3c1189008
2 changed files with 5 additions and 8 deletions
  1. 1 2
      controllers/config/dnsconfig/netmaker.hosts
  2. 4 6
      logic/gateway.go

+ 1 - 2
controllers/config/dnsconfig/netmaker.hosts

@@ -1,2 +1 @@
-10.0.0.1         testnode.skynet
-10.0.0.2         myhost.skynet
+10.0.0.2         testnode.skynet myhost.skynet

+ 4 - 6
logic/gateway.go

@@ -294,9 +294,8 @@ func firewallNFTCommandsCreateIngress(networkInterface string) (string, string)
 	postUp += "nft add rule ip nat POSTROUTING oifname " + networkInterface + " counter masquerade"
 
 	// doesn't remove potentially empty tables or chains
-	postDown := "nft delete rule ip filter FORWARD iifname " + networkInterface + " counter accept ; "
-	postDown += "nft delete rule ip filter FORWARD oifname " + networkInterface + " counter accept ; "
-	postDown += "nft delete rule ip nat POSTROUTING oifname " + networkInterface + " counter masquerade"
+	postDown := "nft flush table filter; "
+	postDown += "nft flush table nat; "
 
 	return postUp, postDown
 }
@@ -308,15 +307,14 @@ func firewallNFTCommandsCreateEgress(networkInterface string, gatewayInterface s
 	postUp += "nft add rule ip filter FORWARD iifname " + networkInterface + " counter accept ; "
 	postUp += "nft add rule ip filter FORWARD oifname " + networkInterface + " counter accept ; "
 
-	postDown := "nft delete rule ip filter FORWARD iifname " + networkInterface + " counter accept ; "
-	postDown += "nft delete rule ip filter FORWARD oifname " + networkInterface + " counter accept ; "
+	postDown := "nft flush table filter; "
 
 	if egressNatEnabled == "yes" {
 		postUp += "nft add table nat ; "
 		postUp += "nft add chain nat POSTROUTING ; "
 		postUp += "nft add rule ip nat POSTROUTING oifname " + gatewayInterface + " counter masquerade ;"
 
-		postDown += "nft delete rule ip nat POSTROUTING oifname " + gatewayInterface + " counter masquerade ;"
+		postDown += "nft flush table nat; "
 	}
 
 	return postUp, postDown