add clear counter commands for ipv6 firewall chain/chain-rule

13 files changed, 24 insertions, 6 deletions

diff --git a/scripts/firewall/vyatta-clear-firewall b/scripts/firewall/vyatta-clear-firewall
index ae48970..46f6b04 100644
--- a/scripts/firewall/vyatta-clear-firewall
+++ b/scripts/firewall/vyatta-clear-firewall
@@ -74,16 +74,14 @@ iptables_cmd=$1
 table_name=$2
 chain_name=$3
 rule_num=$4
+ip_version="IPv4"
+cli_tree="name"
 
-if [[ '6' =~ $iptables_cmd ]]; then
+if [[ '/sbin/ip6tables' =~ $iptables_cmd ]]; then
  ip_version="IPv6"
-else
- ip_version="IPv4"
 fi
 
-if [[ 'filter' =~ $table_name ]]; then
- cli_tree="name"
-else
+if [[ 'mangle' =~ $table_name ]]; then
  cli_tree="modify"
 fi
 
diff --git a/templates/clear/firewall/ipv6-modify/node.def b/templates/clear/firewall/ipv6-modify/node.def
new file mode 100644
index 0000000..208c4f1
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.def
@@ -0,0 +1 @@
+help: Clear firewall statistics for chain
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def b/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
new file mode 100644
index 0000000..1720f91
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall counters
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4"
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/node.def b/templates/clear/firewall/ipv6-modify/node.tag/node.def
new file mode 100644
index 0000000..521953c
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall rules for a given chain
+allowed: ls /opt/vyatta/config/active/firewall/ipv6-modify/ 2>/dev/null
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def
new file mode 100644
index 0000000..ff490a2
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Clear firewall statistics for a rule
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
new file mode 100644
index 0000000..ad6c104
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear counters for specified rule
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "mangle" "$4" "$6"
diff --git a/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
new file mode 100644
index 0000000..dc954f5
--- /dev/null
+++ b/templates/clear/firewall/ipv6-modify/node.tag/rule/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall statistics for given rule
+allowed: ls /opt/vyatta/config/active/firewall/ipv6-modify/${COMP_WORDS[COMP_CWORD-2]}/rule/ 2>/dev/null
diff --git a/templates/clear/firewall/ipv6-name/node.def b/templates/clear/firewall/ipv6-name/node.def
new file mode 100644
index 0000000..208c4f1
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.def
@@ -0,0 +1 @@
+help: Clear firewall statistics for chain
diff --git a/templates/clear/firewall/ipv6-name/node.tag/counters/node.def b/templates/clear/firewall/ipv6-name/node.tag/counters/node.def
new file mode 100644
index 0000000..b2f61a2
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall counters
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "filter" "$4"
diff --git a/templates/clear/firewall/ipv6-name/node.tag/node.def b/templates/clear/firewall/ipv6-name/node.tag/node.def
new file mode 100644
index 0000000..b35fe00
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall rules for a given chain
+allowed: ls /opt/vyatta/config/active/firewall/ipv6-name/ 2>/dev/null
diff --git a/templates/clear/firewall/ipv6-name/node.tag/rule/node.def b/templates/clear/firewall/ipv6-name/node.tag/rule/node.def
new file mode 100644
index 0000000..ff490a2
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.tag/rule/node.def
@@ -0,0 +1 @@
+help: Clear firewall statistics for a rule
diff --git a/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/counters/node.def b/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/counters/node.def
new file mode 100644
index 0000000..de50417
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/counters/node.def
@@ -0,0 +1,2 @@
+help: Clear counters for specified rule
+run:  /opt/vyatta/bin/vyatta-clear-firewall "/sbin/ip6tables" "filter" "$4" "$6"
diff --git a/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/node.def
new file mode 100644
index 0000000..f740f57
--- /dev/null
+++ b/templates/clear/firewall/ipv6-name/node.tag/rule/node.tag/node.def
@@ -0,0 +1,2 @@
+help: Clear firewall statistics for given rule
+allowed: ls /opt/vyatta/config/active/firewall/ipv6-name/${COMP_WORDS[COMP_CWORD-2]}/rule/ 2>/dev/null