diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 08:39:37 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-11-21 09:33:37 -0800 |
| commit | 6946d499c77aa022ca803a9a27db73f46e62d772 (patch) | |
| tree | 10ddb057f4b505b5db8ad2e8eb6ef2da8250532e | |
| parent | f3d9c03906886375e48793e63403fbaa38327aae (diff) | |
| download | vyatta-cfg-firewall-6946d499c77aa022ca803a9a27db73f46e62d772.tar.gz vyatta-cfg-firewall-6946d499c77aa022ca803a9a27db73f46e62d772.zip | |
Rename VyattaIpTablesRule to Vyatta::IpTables::Rule
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | lib/Vyatta/IpTables/Rule.pm (renamed from scripts/firewall/VyattaIpTablesRule.pm) | 13 | ||||
| -rwxr-xr-x | scripts/firewall/vyatta-firewall.pl | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 72adfd4..1b23cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ cfgdir = $(datadir)/vyatta-cfg/templates -share_perl5dir = /opt/vyatta/share/perl5 +share_perl5dir = /opt/vyatta/share/perl5/lib/Vyatta/IpTables curverdir = $(sysconfdir)/config-migrate/current sbin_SCRIPTS = @@ -9,7 +9,7 @@ curver_DATA = cfg-version/firewall@3 sbin_SCRIPTS += scripts/firewall/vyatta-firewall.pl sbin_SCRIPTS += scripts/firewall/firewall.init -share_perl5_DATA += scripts/firewall/VyattaIpTablesRule.pm +share_perl5_DATA += lib/Vyatta/IpTables/Rule.pm cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ cpio -0pd diff --git a/scripts/firewall/VyattaIpTablesRule.pm b/lib/Vyatta/IpTables/Rule.pm index 9ccee2f..196a3ca 100644 --- a/scripts/firewall/VyattaIpTablesRule.pm +++ b/lib/Vyatta/IpTables/Rule.pm @@ -1,10 +1,10 @@ -package VyattaIpTablesRule; +package Vyatta::IpTables::Rule; use VyattaConfig; -use VyattaIpTablesAddressFilter; +require Vyatta::IpTables::AddressFilter; -my $src = new VyattaIpTablesAddressFilter; -my $dst = new VyattaIpTablesAddressFilter; +my $src = new Vyatta::IpTables::AddressFilter; +my $dst = new Vyatta::IpTables::AddressFilter; my %fields = ( _name => undef, @@ -67,8 +67,8 @@ sub new { sub setupDummy { my $self = shift; %{$self} = %dummy_rule; - $src = new VyattaIpTablesAddressFilter; - $dst = new VyattaIpTablesAddressFilter; + $src = new Vyatta::IpTables::AddressFilter; + $dst = new Vyatta::IpTables::AddressFilter; } sub setup { @@ -362,3 +362,4 @@ sub outputXml { $dst->outputXml("dst", $fh); } +1; diff --git a/scripts/firewall/vyatta-firewall.pl b/scripts/firewall/vyatta-firewall.pl index 7523204..950bb1a 100755 --- a/scripts/firewall/vyatta-firewall.pl +++ b/scripts/firewall/vyatta-firewall.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -use lib "/opt/vyatta/share/perl5/"; +use lib "/opt/vyatta/share/perl5"; use VyattaConfig; -use VyattaIpTablesRule; -use VyattaIpTablesAddressFilter; +use Vyatta::IpTables::Rule; +use Vyatta::IpTables::AddressFilter; use Getopt::Long; # Send output of shell commands to syslog for debugging and so that |