summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMohit Mehta <mohit@vyatta.com>2010-09-21 17:35:37 -0700
committerMohit Mehta <mohit@vyatta.com>2010-09-21 17:35:37 -0700
commit4a5a65f74a43ff33a0c4d54eec377502a6d05fdf (patch)
tree31a74a67cf8a6c835e995a710c0ebefdd45a2490 /lib
parent13587019079b9d9a56dc9c4938794c822b8c5ee4 (diff)
downloadvyatta-cfg-4a5a65f74a43ff33a0c4d54eec377502a6d05fdf.tar.gz
vyatta-cfg-4a5a65f74a43ff33a0c4d54eec377502a6d05fdf.zip
* move count_iptables_rule to MISC module
Diffstat (limited to 'lib')
-rwxr-xr-xlib/Vyatta/Misc.pm13
-rwxr-xr-xlib/Vyatta/Zone.pm10
2 files changed, 12 insertions, 11 deletions
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 5373f7f..b774f72 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -26,7 +26,8 @@ require Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(getInterfaces getIP getNetAddIP get_sysfs_value
is_address_enabled is_dhcp_enabled
- isIpAddress is_ip_v4_or_v6 interface_description);
+ isIpAddress is_ip_v4_or_v6 interface_description
+ count_iptables_rules);
our @EXPORT_OK = qw(generate_dhclient_intf_files
getInterfacesIPadresses
getPortRuleString);
@@ -417,4 +418,14 @@ sub interface_description {
return $description;
}
+sub count_iptables_rules {
+ my ($command, $table, $chain) = @_;
+ my @lines = `sudo $command -t $table -L $chain -n --line`;
+ my $cnt = 0;
+ foreach my $line (@lines) {
+ $cnt++ if $line =~ /^\d/;
+ }
+ return $cnt;
+}
+
1;
diff --git a/lib/Vyatta/Zone.pm b/lib/Vyatta/Zone.pm
index 4b169b5..eccf8ab 100755
--- a/lib/Vyatta/Zone.pm
+++ b/lib/Vyatta/Zone.pm
@@ -121,16 +121,6 @@ sub get_zone_chain {
return $chain;
}
-sub count_iptables_rules {
- my ($command, $table, $chain) = @_;
- my @lines = `sudo $command -t $table -L $chain -n --line`;
- my $cnt = 0;
- foreach my $line (@lines) {
- $cnt++ if $line =~ /^\d/;
- }
- return $cnt;
-}
-
sub validity_checks {
my @all_zones = get_all_zones("listNodes");
my @all_interfaces = ();