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

Emit more compact code when conditionally adding DOCKER chains

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2016-02-22 13:49:22 -08:00
parent 36b6863b02
commit 49536562e2
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8472,9 +8472,7 @@ sub create_netfilter_load( $ ) {
assert( $chainref->{cmdlevel} == 0 , $name ); assert( $chainref->{cmdlevel} == 0 , $name );
if ( $name eq 'DOCKER' ) { if ( $name eq 'DOCKER' ) {
enter_cmd_mode; enter_cmd_mode;
emit( 'if [ -n "$g_docker" ]; then', emit( '[ -n "$g_docker" ] && echo ":DOCKER - [0:0]" >&3' );
' echo ":DOCKER - [0:0]" >&3',
'fi' );
enter_cat_mode; enter_cat_mode;
} else { } else {
emit_unindented ":$name - [0:0]"; emit_unindented ":$name - [0:0]";
@ -8569,9 +8567,7 @@ sub preview_netfilter_load() {
assert( $chainref->{cmdlevel} == 0 , $name ); assert( $chainref->{cmdlevel} == 0 , $name );
if ( $name eq 'DOCKER' ) { if ( $name eq 'DOCKER' ) {
enter_cmd_mode; enter_cmd_mode;
emit( 'if [ -n "$g_docker" ]; then', emit( '[ -n "$g_docker" ] && echo ":DOCKER - [0:0]" >&3' );
' echo ":DOCKER - [0:0]" >&3',
'fi' );
enter_cat_mode; enter_cat_mode;
} else { } else {
emit_unindented ":$name - [0:0]"; emit_unindented ":$name - [0:0]";
@ -8799,9 +8795,7 @@ sub create_stop_load( $ ) {
assert( $chainref->{cmdlevel} == 0 , $name ); assert( $chainref->{cmdlevel} == 0 , $name );
if ( $name eq 'DOCKER' ) { if ( $name eq 'DOCKER' ) {
enter_cmd_mode; enter_cmd_mode;
emit( 'if [ -n "$g_docker" ]; then', emit( '[ -n "$g_docker" ] && echo ":DOCKER - [0:0]" >&3' );
' echo ":DOCKER - [0:0]" >&3',
'fi' );
enter_cat_mode; enter_cat_mode;
} else { } else {
emit_unindented ":$name - [0:0]"; emit_unindented ":$name - [0:0]";