holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Cosmetic cleanup of the Compiler module

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-06-08 11:27:37 -07:00
parent f6b77c17ac
commit 116e85e040
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -529,14 +529,12 @@ EOF
emit( ' run_refreshed_exit', emit( ' run_refreshed_exit',
' do_iptables -N shorewall' ); ' do_iptables -N shorewall' );
emit ( ' do_iptables -A shorewall -m recent --set --name %CURRENTTIME' ) if have_capability 'RECENT_MATCH'; emit( ' do_iptables -A shorewall -m recent --set --name %CURRENTTIME' ) if have_capability 'RECENT_MATCH';
emit( emit( " set_state Started $config_dir",
" set_state Started $config_dir", ' [ $0 = ${VARDIR}/firewall ] || cp -f $(my_pathname) ${VARDIR}/firewall',
' [ $0 = ${VARDIR}/firewall ] || cp -f $(my_pathname) ${VARDIR}/firewall', 'else',
'else', ' setup_netfilter' );
' setup_netfilter'
);
push_indent; push_indent;
emit 'setup_arptables' if $have_arptables; emit 'setup_arptables' if $have_arptables;
@ -604,12 +602,12 @@ sub compiler {
sub validate_boolean( $ ) { sub validate_boolean( $ ) {
my $val = numeric_value( shift ); my $val = numeric_value( shift );
defined($val) && ($val >= 0) && ($val < 2); defined($val) && ($val >= 0) && ($val < 2);
} }
sub validate_verbosity( $ ) { sub validate_verbosity( $ ) {
my $val = numeric_value( shift ); my $val = numeric_value( shift );
defined($val) && ($val >= MIN_VERBOSITY) && ($val <= MAX_VERBOSITY); defined($val) && ($val >= MIN_VERBOSITY) && ($val <= MAX_VERBOSITY);
} }
sub validate_family( $ ) { sub validate_family( $ ) {
my $val = numeric_value( shift ); my $val = numeric_value( shift );
@ -852,7 +850,7 @@ sub compiler {
# #
setup_tunnels; setup_tunnels;
# #
# Clear the current filename # Clear the current filename so that the last one processed doesn't appear in error and warning messages
# #
clear_currentfilename; clear_currentfilename;
# #