extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate 'emiti()'

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6944 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-23 19:07:45 +00:00
parent 55a3832991
commit 0e555dcd57
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Shorewall-perl/Shorewall/Chains.pm
View File

@ -1822,6 +1822,21 @@ sub insertnatjump( $$$$ ) {
# What follows is the code that generates the input to iptables-restore # What follows is the code that generates the input to iptables-restore
# #
sub assure_cat_state() {
unless ( $state == CAT_STATE ) {
emit '';
emit 'cat >&3 << __EOF__';
$state = CAT_STATE;
}
}
sub assure_cmd_state() {
unless ( $state == CMD_STATE ) {
emit_unindented "__EOF__\n" if $state == CAT_STATE;
$state = CMD_STATE;
}
}
# #
# Emits the passed rule (input to iptables-restore) or command # Emits the passed rule (input to iptables-restore) or command
# #
@ -1832,36 +1847,14 @@ sub emitr( $ ) {
# #
# A command rather than a rule # A command rather than a rule
# #
unless ( $state == CMD_STATE ) { assure_cmd_state;
emit_unindented "__EOF__\n" if $state == CAT_STATE;
$state = CMD_STATE;
}
emit $rule; emit $rule;
} else { } else {
unless ( $state == CAT_STATE ) { assure_cat_state;
emit( '',
'cat >&3 << __EOF__' );
$state = CAT_STATE;
}
emit_unindented $rule; emit_unindented $rule;
} }
} }
#
# Emit the passed input to iptables-restore
#
sub emiti( $ ) {
unless ( $state == CAT_STATE ) {
emit '';
emit 'cat >&3 << __EOF__';
$state = CAT_STATE;
}
emit_unindented $_[0];
}
sub emit_comment() { sub emit_comment() {
unless ( $emitted_comment ) { unless ( $emitted_comment ) {
emit ( '#', emit ( '#',
@ -1923,7 +1916,8 @@ sub create_netfilter_load() {
push @table_list, 'filter'; push @table_list, 'filter';
for my $table ( @table_list ) { for my $table ( @table_list ) {
emiti "*$table"; assure_cat_state;
emit_unindented "*$table";
my @chains; my @chains;
# #
@ -1932,7 +1926,7 @@ sub create_netfilter_load() {
for my $chain ( @builtins ) { for my $chain ( @builtins ) {
my $chainref = $chain_table{$table}{$chain}; my $chainref = $chain_table{$table}{$chain};
if ( $chainref ) { if ( $chainref ) {
emiti ":$chain $chainref->{policy} [0:0]"; emit_unindented ":$chain $chainref->{policy} [0:0]";
push @chains, $chainref; push @chains, $chainref;
} }
} }
@ -1942,7 +1936,7 @@ sub create_netfilter_load() {
for my $chain ( grep $chain_table{$table}{$_}->{referenced} , ( sort keys %{$chain_table{$table}} ) ) { for my $chain ( grep $chain_table{$table}{$_}->{referenced} , ( sort keys %{$chain_table{$table}} ) ) {
my $chainref = $chain_table{$table}{$chain}; my $chainref = $chain_table{$table}{$chain};
unless ( $chainref->{builtin} ) { unless ( $chainref->{builtin} ) {
emiti ":$chainref->{name} - [0:0]"; emit_unindented ":$chainref->{name} - [0:0]";
push @chains, $chainref; push @chains, $chainref;
} }
} }
@ -1958,10 +1952,11 @@ sub create_netfilter_load() {
# #
# Commit the changes to the table # Commit the changes to the table
# #
emiti 'COMMIT'; assure_cat_state;
emit_unindented 'COMMIT';
} }
emit_unindented '__EOF__' unless $state == CMD_STATE; emit_unindented '__EOF__';
emit ''; emit '';
# #
# Now generate the actual iptables-restore command # Now generate the actual iptables-restore command
@ -2003,8 +1998,10 @@ sub create_blacklist_reload() {
# #
emit 'exec 3>${VARDIR}/.iptables-restore-input'; emit 'exec 3>${VARDIR}/.iptables-restore-input';
emiti '*filter'; assure_cat_state;
emiti ':blacklst - [0:0]';
emit_unindented '*filter';
emit_unindented ':blacklst - [0:0]';
for my $rule ( @{$filter_table->{blacklst}{rules}} ) { for my $rule ( @{$filter_table->{blacklst}{rules}} ) {
emitr $rule; emitr $rule;
@ -2012,7 +2009,9 @@ sub create_blacklist_reload() {
# #
# Commit the changes to the table # Commit the changes to the table
# #
emiti 'COMMIT'; assure_cat_state;
emit_unindented 'COMMIT';
emit_unindented '__EOF__' unless $state == CMD_STATE; emit_unindented '__EOF__' unless $state == CMD_STATE;
emit ''; emit '';