forked from extern/shorewall_code
Fix bug in fwmark rule generation
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5509 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
59152dfc79
commit
6c913f010f
@ -5569,8 +5569,7 @@ sub add_a_provider( $$$$$$$$ ) {
|
||||
fatal_error "Duplicate provider ( $table )" if $providers{$table};
|
||||
|
||||
for my $provider ( keys %providers ) {
|
||||
my $num = $providers{$provider}{number};
|
||||
fatal_error "Duplicate provider number ( $number )" if $num == $number;
|
||||
fatal_error "Duplicate provider number ( $number )" if $providers{$provider}{number} == $number;
|
||||
}
|
||||
|
||||
emit "#\n# Add Provider $table ($number)\n#";
|
||||
@ -5645,7 +5644,8 @@ sub add_a_provider( $$$$$$$$ ) {
|
||||
|
||||
|
||||
emit "qt ip rule del fwmark $mark";
|
||||
emit "run_ip rule add fwmark $mark pref \$((10000 + $mark)) table $number";
|
||||
my $pref = 10000 + $val;
|
||||
emit "run_ip rule add fwmark $mark pref $pref table $number";
|
||||
emit "echo \"qt ip rule del fwmark $mark\" >> \${VARDIR}/undo_routing";
|
||||
}
|
||||
|
||||
@ -5831,8 +5831,6 @@ sub setup_providers() {
|
||||
emit "\$echocommand \"$providers{$table}{number}\\t$table\" >> /etc/iproute2/rt_tables";
|
||||
}
|
||||
|
||||
emit '';
|
||||
|
||||
if ( -s "$ENV{TMP_DIR}/route_rules" ) {
|
||||
my $fn = find_file 'route_rules';
|
||||
progress_message2 "$doing $fn...";
|
||||
|
Loading…
Reference in New Issue
Block a user