extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-01 23:45:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change initialization order

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6427 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-05-20 20:30:47 +00:00
parent 51590da0b8
commit b029ebac16
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Shorewall-perl/compiler.pl
View File

@ -466,8 +466,9 @@ EOF
# #
# Second Phase of Script Generation # Second Phase of Script Generation
# #
# copies the 'prog.functions' file into the script # copies the 'prog.functions' file into the script, generates
# generates the first part of 'setup_routing_and_traffic_shaping()' # generates clear_routing_and_traffic_shaping() and the first part of
# 'setup_routing_and_traffic_shaping()'
# #
# The bulk of that function is produced by the various config file # The bulk of that function is produced by the various config file
# parsing routines that are called directly out of 'compiler()'. # parsing routines that are called directly out of 'compiler()'.
@ -476,10 +477,11 @@ sub generate_script_2 () {
copy $globals{SHAREDIRPL} . 'prog.functions'; copy $globals{SHAREDIRPL} . 'prog.functions';
emitj( '#', emitj( '',
'# Setup Routing and Traffic Shaping',
'#', '#',
'setup_routing_and_traffic_shaping() {' '# Clear Routing and Traffic Shaping',
'#',
'clear_routing_and_traffic_shaping() {'
); );
push_indent; push_indent;
@ -543,6 +545,17 @@ sub generate_script_2 () {
emit "disable_ipv6\n" if $config{DISABLE_IPV6}; emit "disable_ipv6\n" if $config{DISABLE_IPV6};
setup_mss( $config{CLAMPMSS} ) if $config{CLAMPMSS}; setup_mss( $config{CLAMPMSS} ) if $config{CLAMPMSS};
pop_indent;
emit "}\n";
emitj( '#',
'# Setup Routing and Traffic Shaping',
'#',
'setup_routing_and_traffic_shaping() {'
);
push_indent;
} }
# #
@ -584,12 +597,14 @@ sub generate_script_3() {
emit 'define_firewall() {'; emit 'define_firewall() {';
push_indent; push_indent;
emit "\nclear_routing_and_traffic_shaping";
set_global_variables; set_global_variables;
emit ''; emit '';
emit<<'EOF'; emit<<'EOF';
setup_routing_and_traffic_shaping; setup_routing_and_traffic_shaping
if [ $COMMAND = restore ]; then if [ $COMMAND = restore ]; then
iptables_save_file=${VARDIR}/$(basename $0)-iptables iptables_save_file=${VARDIR}/$(basename $0)-iptables