extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-04 21:41:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'Shorewall-perl' with 'Shorewall'

Browse Source
This commit is contained in:
Tom Eastep 2009-06-13 07:07:55 -07:00
parent 8c6de64332
commit e2ae6453ac
16 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Accounting.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Accounting.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Accounting.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Actions.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Actions.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Actions.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

6
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Chains.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Chains.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
@ -2893,7 +2893,7 @@ sub create_netfilter_load( $ ) {
unless ( $test ) { unless ( $test ) {
emit_unindented '#'; emit_unindented '#';
emit_unindented "# Generated by Shorewall-perl $globals{VERSION} - $date"; emit_unindented "# Generated by Shorewall $globals{VERSION} - $date";
emit_unindented '#'; emit_unindented '#';
} }
@ -3109,7 +3109,7 @@ sub create_stop_load( $ ) {
unless ( $test ) { unless ( $test ) {
my $date = localtime; my $date = localtime;
emit_unindented '#'; emit_unindented '#';
emit_unindented "# Generated by Shorewall-perl $globals{VERSION} - $date"; emit_unindented "# Generated by Shorewall $globals{VERSION} - $date";
emit_unindented '#'; emit_unindented '#';
} }

6
Shorewall/Perl/Shorewall/Compiler.pm
View File

@ -1,6 +1,6 @@
#! /usr/bin/perl -w #! /usr/bin/perl -w
# #
# The Shoreline Firewall4 (Shorewall-perl) Packet Filtering Firewall Compiler - V4.4 # The Shoreline Firewall Packet Filtering Firewall Compiler - V4.4
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
@ -84,7 +84,7 @@ sub generate_script_1() {
if ( $test ) { if ( $test ) {
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl\n#"; emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl\n#";
} else { } else {
emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall-perl $globals{VERSION} - $date\n#"; emit "#!/bin/sh\n#\n# Compiled firewall script generated by Shorewall $globals{VERSION} - $date\n#";
if ( $family == F_IPV4 ) { if ( $family == F_IPV4 ) {
copy $globals{SHAREDIRPL} . 'prog.header'; copy $globals{SHAREDIRPL} . 'prog.header';
} else { } else {
@ -584,7 +584,7 @@ sub compiler {
report_capabilities; report_capabilities;
require_capability( 'MULTIPORT' , "Shorewall-perl $globals{VERSION}" , 's' ); require_capability( 'MULTIPORT' , "Shorewall $globals{VERSION}" , 's' );
require_capability( 'RECENT_MATCH' , 'MACLIST_TTL' , 's' ) if $config{MACLIST_TTL}; require_capability( 'RECENT_MATCH' , 'MACLIST_TTL' , 's' ) if $config{MACLIST_TTL};
require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{HIGH_ROUTE_MARKS}; require_capability( 'XCONNMARK' , 'HIGH_ROUTE_MARKS=Yes' , 's' ) if $config{HIGH_ROUTE_MARKS};
require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED}; require_capability( 'MANGLE_ENABLED' , 'Traffic Shaping' , 's' ) if $config{TC_ENABLED};

18
Shorewall/Perl/Shorewall/Config.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Config.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Config.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
@ -348,6 +348,7 @@ sub initialize( $ ) {
LOGBURST => undef, LOGBURST => undef,
LOGALLNEW => undef, LOGALLNEW => undef,
BLACKLIST_LOGLEVEL => undef, BLACKLIST_LOGLEVEL => undef,
RFC1918_LOG_LEVEL => undef,
MACLIST_LOG_LEVEL => undef, MACLIST_LOG_LEVEL => undef,
TCP_FLAGS_LOG_LEVEL => undef, TCP_FLAGS_LOG_LEVEL => undef,
SMURF_LOG_LEVEL => undef, SMURF_LOG_LEVEL => undef,
@ -429,6 +430,7 @@ sub initialize( $ ) {
DONT_LOAD => '', DONT_LOAD => '',
AUTO_COMMENT => undef , AUTO_COMMENT => undef ,
MANGLE_ENABLED => undef , MANGLE_ENABLED => undef ,
RFC1918_STRICT => undef ,
NULL_ROUTE_RFC1918 => undef , NULL_ROUTE_RFC1918 => undef ,
USE_DEFAULT_RT => undef , USE_DEFAULT_RT => undef ,
RESTORE_DEFAULT_ROUTE => undef , RESTORE_DEFAULT_ROUTE => undef ,
@ -2180,7 +2182,7 @@ sub unsupported_yes_no( $ ) {
default_yes_no $option, ''; default_yes_no $option, '';
fatal_error "$option=Yes is not supported by Shorewall-perl $globals{VERSION}" if $config{$option}; fatal_error "$option=Yes is not supported by Shorewall $globals{VERSION}" if $config{$option};
} }
# #
@ -2286,16 +2288,14 @@ sub get_configuration( $ ) {
unsupported_yes_no 'BRIDGING'; unsupported_yes_no 'BRIDGING';
unsupported_yes_no 'SAVE_IPSETS'; unsupported_yes_no 'SAVE_IPSETS';
unsupported_yes_no 'MAPOLDACTIONS'; unsupported_yes_no 'MAPOLDACTIONS';
unsupported_yes_no 'RFC1918_STRICT';
default_yes_no 'STARTUP_ENABLED' , 'Yes'; default_yes_no 'STARTUP_ENABLED' , 'Yes';
default_yes_no 'DELAYBLACKLISTLOAD' , ''; default_yes_no 'DELAYBLACKLISTLOAD' , '';
warning_message 'DELAYBLACKLISTLOAD=Yes is not supported by Shorewall-perl ' . $globals{VERSION} if $config{DELAYBLACKLISTLOAD}; warning_message 'DELAYBLACKLISTLOAD=Yes is not supported by Shorewall ' . $globals{VERSION} if $config{DELAYBLACKLISTLOAD};
default_yes_no 'LOGTAGONLY' , ''; $globals{LOGTAGONLY} = $config{LOGTAGONLY}; default_yes_no 'LOGTAGONLY' , ''; $globals{LOGTAGONLY} = $config{LOGTAGONLY};
default_yes_no 'RFC1918_STRICT' , '';
warning_message 'RFC1918_STRICT=Yes ignored. The "norfc1918" interface/host option is no longer supported' if $config{RFC1918_STRICT};
default_yes_no 'FASTACCEPT' , ''; default_yes_no 'FASTACCEPT' , '';
@ -2306,7 +2306,7 @@ sub get_configuration( $ ) {
default_yes_no 'TC_EXPERT' , ''; default_yes_no 'TC_EXPERT' , '';
default_yes_no 'USE_ACTIONS' , 'Yes'; default_yes_no 'USE_ACTIONS' , 'Yes';
warning_message 'USE_ACTIONS=No is not supported by Shorewall-perl ' . $globals{VERSION} unless $config{USE_ACTIONS}; warning_message 'USE_ACTIONS=No is not supported by Shorewall ' . $globals{VERSION} unless $config{USE_ACTIONS};
default_yes_no 'EXPORTPARAMS' , ''; default_yes_no 'EXPORTPARAMS' , '';
default_yes_no 'EXPAND_POLICIES' , ''; default_yes_no 'EXPAND_POLICIES' , '';
@ -2396,7 +2396,7 @@ sub get_configuration( $ ) {
default 'ACCEPT_DEFAULT' , 'none'; default 'ACCEPT_DEFAULT' , 'none';
default 'OPTIMIZE' , 0; default 'OPTIMIZE' , 0;
fatal_error 'IPSECFILE=ipsec is not supported by Shorewall-perl ' . $globals{VERSION} unless $config{IPSECFILE} eq 'zones'; fatal_error 'IPSECFILE=ipsec is not supported by Shorewall ' . $globals{VERSION} unless $config{IPSECFILE} eq 'zones';
for my $default qw/DROP_DEFAULT REJECT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT ACCEPT_DEFAULT/ { for my $default qw/DROP_DEFAULT REJECT_DEFAULT QUEUE_DEFAULT NFQUEUE_DEFAULT ACCEPT_DEFAULT/ {
$config{$default} = 'none' if "\L$config{$default}" eq 'none'; $config{$default} = 'none' if "\L$config{$default}" eq 'none';
@ -2591,7 +2591,7 @@ sub generate_aux_config() {
my $date = localtime; my $date = localtime;
emit "#\n# Shorewall auxiliary configuration file created by Shorewall-perl version $globals{VERSION} - $date\n#"; emit "#\n# Shorewall auxiliary configuration file created by Shorewall version $globals{VERSION} - $date\n#";
for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE) { for my $option qw(VERBOSITY LOGFILE LOGFORMAT IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE) {
conditionally_add_option $option; conditionally_add_option $option;

2
Shorewall/Perl/Shorewall/IPAddrs.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/IPAddrs.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/IPAddrs.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Nat.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Nat.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Policy.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Policy.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Policy.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Proc.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall 4.4 -- /usr/share/shorewall-perl/Shorewall/Proc.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Proc.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Providers.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Providers.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Proxyarp.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Proxyarp.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Proxyarp.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Raw.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Raw.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Raw.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Rules.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Rules.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Rules.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Tc.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Tc.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Tc.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

2
Shorewall/Perl/Shorewall/Tunnels.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Tunnels.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Tunnels.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #

4
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -1,5 +1,5 @@
# #
# Shorewall-perl 4.4 -- /usr/share/shorewall-perl/Shorewall/Zones.pm # Shorewall 4.4 -- /usr/share/shorewall/Shorewall/Zones.pm
# #
# This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] # This program is under GPL [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]
# #
@ -838,7 +838,7 @@ sub process_interface( $ ) {
# #
$hostoptions{broadcast} = 1; $hostoptions{broadcast} = 1;
} else { } else {
warning_message "Support for the $option interface option has been removed from Shorewall-perl"; warning_message "Support for the $option interface option has been removed from Shorewall";
} }
} }