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

Add the LEGACY_RESTART option.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2015-07-27 09:19:52 -07:00
parent b1d75e53a1
commit fa7248c58c
14 changed files with 86 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -855,6 +855,7 @@ sub initialize( $;$$) {
INLINE_MATCHES => undef,
BASIC_FILTERS => undef,
WORKAROUNDS => undef ,
LEGACY_RESTART => undef ,
#
# Packet Disposition
#
@ -5728,6 +5729,7 @@ sub get_configuration( $$$$$ ) {
default_yes_no 'INLINE_MATCHES' , '';
default_yes_no 'BASIC_FILTERS' , '';
default_yes_no 'WORKAROUNDS' , 'Yes';
default_yes_no 'LEGACY_RESTART' , '';
require_capability( 'BASIC_EMATCH', 'BASIC_FILTERS=Yes', 's' ) if $config{BASIC_FILTERS};
@ -6272,7 +6274,7 @@ sub generate_aux_config() {
emit "#\n# Shorewall auxiliary configuration file created by Shorewall version $globals{VERSION} - $date\n#";
for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS) ) {
for my $option ( qw(VERBOSITY LOGFILE LOGFORMAT ARPTABLES IPTABLES IP6TABLES IP TC IPSET PATH SHOREWALL_SHELL SUBSYSLOCK LOCKFILE RESTOREFILE WORKAROUNDS LEGACY_RESTART) ) {
conditionally_add_option $option;
}

44
Shorewall/Perl/prog.footer
View File

@ -65,6 +65,25 @@ stop_command() {
return 0
}
reload_command() {
if product_is_started; then
progress_message3 "Reloading $g_product...."
else
error_message "$g_product is not running"
progress_message3 "Starting $g_product...."
COMMAND=start
fi
detect_configuration
define_firewall
status=$?
if [ -n "$SUBSYSLOCK" ]; then
[ $status -eq 0 ] && touch $SUBSYSLOCK || rm -f $SUBSYSLOCK
fi
[ $status -eq 0 ] && progress_message3 "done."
}
################################################################################
# E X E C U T I O N B E G I N S H E R E #
################################################################################
@ -264,26 +283,17 @@ case "$COMMAND" in
;;
reload)
[ $# -ne 1 ] && usage 2
if product_is_started; then
progress_message3 "Reloading $g_product...."
else
error_message "$g_product is not running"
progress_message3 "Starting $g_product...."
COMMAND=start
fi
detect_configuration
define_firewall
status=$?
if [ -n "$SUBSYSLOCK" ]; then
[ $status -eq 0 ] && touch $SUBSYSLOCK || rm -f $SUBSYSLOCK
fi
[ $status -eq 0 ] && progress_message3 "done."
reload_command
;;
restart)
[ $# -ne 1 ] && usage 2
COMMAND=stop stop_command && COMMAND=start start_command
if [ -z "$LEGACY_RESTART" ]; then
COMMAND=stop stop_command && COMMAND=start start_command
else
COMMAND=reload
reload_command
fi
;;
refresh)
[ $# -ne 1 ] && usage 2

2
Shorewall/Samples/Universal/shorewall.conf
View File

@ -178,6 +178,8 @@ LOAD_HELPERS_ONLY=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
MACLIST_TABLE=filter
MACLIST_TTL=

2
Shorewall/Samples/one-interface/shorewall.conf
View File

@ -189,6 +189,8 @@ LOAD_HELPERS_ONLY=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
MACLIST_TABLE=filter
MACLIST_TTL=

2
Shorewall/Samples/three-interfaces/shorewall.conf
View File

@ -186,6 +186,8 @@ LOAD_HELPERS_ONLY=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
MACLIST_TABLE=filter
MACLIST_TTL=

2
Shorewall/Samples/two-interfaces/shorewall.conf
View File

@ -189,6 +189,8 @@ LOAD_HELPERS_ONLY=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
MACLIST_TABLE=filter
MACLIST_TTL=

2
Shorewall/configfiles/shorewall.conf
View File

@ -176,6 +176,8 @@ KEEP_RT_TABLES=No
LEGACY_FASTSTART=Yes
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

18
Shorewall/manpages/shorewall.conf.xml
View File

@ -1291,6 +1291,24 @@ net all DROP info</programlisting>then the chain name is 'net-all'
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem>
<para>Added in Shorewall 5.0.0. In that release, the <emphasis
role="bold">reload</emphasis> command was redefined to do what
<emphasis role="bold">restart</emphasis> had done in earlier
releases and <emphasis role="bold">restart</emphasis> became a true
restart (equivalent to <emphasis role="bold">stop</emphasis>
followed by <emphasis role="bold">start</emphasis>). When
LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
command performs the same operation as the reload command making it
compatible with earlier releases. If not specified,
LAGACY_RESTART=No is assumed.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>

2
Shorewall6/Samples6/Universal/shorewall6.conf
View File

@ -165,6 +165,8 @@ KEEP_RT_TABLES=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

2
Shorewall6/Samples6/one-interface/shorewall6.conf
View File

@ -165,6 +165,8 @@ KEEP_RT_TABLES=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

2
Shorewall6/Samples6/three-interfaces/shorewall6.conf
View File

@ -165,6 +165,8 @@ KEEP_RT_TABLES=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

2
Shorewall6/Samples6/two-interfaces/shorewall6.conf
View File

@ -165,6 +165,8 @@ KEEP_RT_TABLES=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

2
Shorewall6/configfiles/shorewall6.conf
View File

@ -165,6 +165,8 @@ KEEP_RT_TABLES=Yes
LEGACY_FASTSTART=No
LEGACY_RESTART=Yes
LOAD_HELPERS_ONLY=Yes
MACLIST_TABLE=filter

18
Shorewall6/manpages/shorewall6.conf.xml
View File

@ -1142,6 +1142,24 @@ net all DROP info</programlisting>then the chain name is 'net-all'
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">LEGACY_RESTART=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>
<listitem>
<para>Added in Shorewall 5.0.0. In that release, the <emphasis
role="bold">reload</emphasis> command was redefined to do what
<emphasis role="bold">restart</emphasis> had done in earlier
releases and <emphasis role="bold">restart</emphasis> became a true
restart (equivalent to <emphasis role="bold">stop</emphasis>
followed by <emphasis role="bold">start</emphasis>). When
LEGACY_FASTSTART=Yes, the <emphasis role="bold">restart</emphasis>
command performs the same operation as the reload command making it
compatible with earlier releases. If not specified,
LAGACY_RESTART=No is assumed.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">LOAD_HELPERS_ONLY=</emphasis>{<emphasis
role="bold">Yes</emphasis>|<emphasis role="bold">No</emphasis>}</term>