diff options
| author | Mohit Mehta <mohit@vyatta.com> | 2010-09-21 21:14:32 -0700 |
|---|---|---|
| committer | Mohit Mehta <mohit@vyatta.com> | 2010-09-21 21:14:32 -0700 |
| commit | 2ff90edde65e2f9ad8dbb4c0e8d9de84cb316032 (patch) | |
| tree | ceadc3ec242455182fcb45b7cb4ee5f2fe82e714 | |
| parent | 551a029493eecd5d013f5e84420158e85a0c8830 (diff) | |
| download | vyatta-cfg-quagga-2ff90edde65e2f9ad8dbb4c0e8d9de84cb316032.tar.gz vyatta-cfg-quagga-2ff90edde65e2f9ad8dbb4c0e8d9de84cb316032.zip | |
* update count_iptables module usage
| -rwxr-xr-x | scripts/zone-mgmt/vyatta-zone.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/zone-mgmt/vyatta-zone.pl b/scripts/zone-mgmt/vyatta-zone.pl index 6597dd10..0c058427 100755 --- a/scripts/zone-mgmt/vyatta-zone.pl +++ b/scripts/zone-mgmt/vyatta-zone.pl @@ -28,7 +28,7 @@ use POSIX; use lib "/opt/vyatta/share/perl5"; use Vyatta::Zone; -use Vyatta::Misc; +use Vyatta::IpTables::Mgr; use warnings; use strict; @@ -61,7 +61,7 @@ sub setup_default_policy { $error = Vyatta::Zone::run_cmd("$cmd"); return "Error: set default policy $zone_chain failed [$error]" if $error; - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$tree}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$tree}, $table_hash{$tree}, $zone_chain); # if there's a drop|reject rule at rule_cnt - 1 then remove that @@ -141,7 +141,7 @@ sub insert_from_rule { if (defined $ruleset_name) { # get number of rules in ruleset_name - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$ruleset_type}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$ruleset_type}, $table_hash{$ruleset_type}, "$zone_chain"); # append rules before last drop all rule my $insert_at_rule_num=1; @@ -265,7 +265,7 @@ failed [$error]" if $error; } # need to do this as an append before VYATTA_POST_FW_*_HOOK - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$tree}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$tree}, $table_hash{$tree}, "FORWARD"); my $insert_at_rule_num=1; if ( $rule_cnt > 1 ) { @@ -377,7 +377,7 @@ sub do_firewall_localzone { my $zone_chain=Vyatta::Zone::get_zone_chain("exists", $zone_name); foreach my $tree (keys %cmd_hash) { - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$tree}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$tree}, $table_hash{$tree}, "INPUT"); my $insert_at_rule_num=1; if ( $rule_cnt > 1 ) { @@ -619,7 +619,7 @@ sub add_fromzone_fw { # add jump to local-zone-out chain in OUTPUT chains for [ip and ip6]tables foreach my $tree (keys %cmd_hash) { # if jump to localzoneout chain not inserted, then insert rule - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$tree}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$tree}, $table_hash{$tree}, "OUTPUT"); my $insert_at_rule_num=1; if ( $rule_cnt > 1 ) { @@ -672,7 +672,7 @@ sub delete_fromzone_fw { # if only drop rule & localhost allow rule in $zone_chain in both # [ip and ip6]tables then delete jump from OUTPUT chain in both foreach my $tree (keys %cmd_hash) { - my $rule_cnt = Vyatta::Misc::count_iptables_rules($cmd_hash{$tree}, + my $rule_cnt = Vyatta::IpTables::Mgr::count_iptables_rules($cmd_hash{$tree}, $table_hash{$tree}, $zone_chain); if ($rule_cnt > 2) { # atleast one of [ip or ip6]tables has local-zone as a from zone |