diff options
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | lib/Vyatta/FirewallOpMode/Summary.pm | 2 | ||||
| -rwxr-xr-x | scripts/firewall/vyatta-show-firewall.pl | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/control b/debian/control index 77725bb..00dc14d 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Package: vyatta-op-firewall Architecture: all Depends: vyatta-op, vyatta-bash | bash (>= 3.1), + vyatta-cfg (>= 0.101.0), vyatta-op-xml Suggests: util-linux (>= 2.13-5), net-tools, diff --git a/lib/Vyatta/FirewallOpMode/Summary.pm b/lib/Vyatta/FirewallOpMode/Summary.pm index 4eee35a..7744291 100755 --- a/lib/Vyatta/FirewallOpMode/Summary.pm +++ b/lib/Vyatta/FirewallOpMode/Summary.pm @@ -80,7 +80,7 @@ my %description_hash = ( 'name' => 'IPv4', sub show_tree { my ($tree, $config) = @_; my $tree_hash = {}; - my @cfg_ifs = Vyatta::Interface::get_all_cfg_interfaces(1); + my @cfg_ifs = Vyatta::Interface::get_effective_interfaces(); my $description = $description_hash{$tree}; $config->setLevel("firewall $tree"); my @chains = $config->listOrigNodes(); diff --git a/scripts/firewall/vyatta-show-firewall.pl b/scripts/firewall/vyatta-show-firewall.pl index 73f825f..aadeb54 100755 --- a/scripts/firewall/vyatta-show-firewall.pl +++ b/scripts/firewall/vyatta-show-firewall.pl @@ -54,7 +54,7 @@ sub show_interfaces_zones { my $cfg = new Vyatta::Config; my @int_strs = (); - for (Vyatta::Interface::get_all_cfg_interfaces(1)) { + for (Vyatta::Interface::get_effective_interfaces()) { my ($iname, $ipath) = ($_->{name}, $_->{path}); for my $dir ($cfg->listOrigNodes("$ipath firewall")) { my $ichain = $cfg->returnOrigValue("$ipath firewall $dir $tree"); |