diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index a04661d5f..e4982af2c 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -356,7 +356,6 @@ sub initialize() { DELETE_THEN_ADD => undef, MULTICAST => undef, DONT_LOAD => '', - BROKEN_ROUTING => '', AUTO_COMMENT => '' , # # Packet Disposition @@ -1912,7 +1911,6 @@ sub get_configuration( $ ) { default_yes_no 'EXPAND_POLICIES' , ''; default_yes_no 'KEEP_RT_TABLES' , ''; default_yes_no 'DELETE_THEN_ADD' , 'Yes'; - default_yes_no 'BROKEN_ROUTING' , ''; default_yes_no 'AUTO_COMMENT' , 'Yes'; default_yes_no 'MULTICAST' , ''; default_yes_no 'MARK_IN_FORWARD_CHAIN' , ''; diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm index ca124e2cc..605738dc5 100644 --- a/Shorewall-perl/Shorewall/Providers.pm +++ b/Shorewall-perl/Shorewall/Providers.pm @@ -339,12 +339,7 @@ sub add_a_provider( $$$$$$$$ ) { if ( $gateway ) { $address = get_interface_address $interface unless $address; - if ( $config{BROKEN_ROUTING} ) { - emit "qt ip route delete $gateway table $number"; - emit "run_ip route add $gateway src $address dev $interface ${mtu}table $number $realm"; - } else { - emit "run_ip route replace $gateway src $address dev $interface ${mtu}table $number $realm"; - } + emit "run_ip route replace $gateway src $address dev $interface ${mtu}table $number $realm"; emit "run_ip route add default via $gateway src $address dev $interface ${mtu}table $number $realm"; } @@ -516,14 +511,8 @@ sub setup_providers() { if ( $balance ) { emit ( 'if [ -n "$DEFAULT_ROUTE" ]; then' ); - if ( $config{BROKEN_ROUTING} ) { - emit( ' run_ip route del default' ); - emit( ' run_ip route add default scope global $DEFAULT_ROUTE' ); - } else { - emit( ' run_ip route replace default scope global $DEFAULT_ROUTE' ); - } - - emit ( " progress_message \"Default route '\$(echo \$DEFAULT_ROUTE | sed 's/\$\\s*//')' Added\"", + emit ( ' run_ip route replace default scope global $DEFAULT_ROUTE', + " progress_message \"Default route '\$(echo \$DEFAULT_ROUTE | sed 's/\$\\s*//')' Added\"", 'else', ' error_message "WARNING: No Default route added (all \'balance\' providers are down)"', ' restore_default_route', diff --git a/Shorewall-perl/Shorewall/Proxyarp.pm b/Shorewall-perl/Shorewall/Proxyarp.pm index 688ab8efc..280ff633c 100644 --- a/Shorewall-perl/Shorewall/Proxyarp.pm +++ b/Shorewall-perl/Shorewall/Proxyarp.pm @@ -76,14 +76,7 @@ sub setup_one_proxy_arp( $$$$$ ) { } unless ( $haveroute ) { - - if ( $config{BROKEN_ROUTING} ) { - emit "[ -n \"\$NOROUTES\" ] || qt ip route del $address"; - emit "[ -n \"\$NOROUTES\" ] || run_ip route add $address dev $interface"; - } else { - emit "[ -n \"\$NOROUTES\" ] || run_ip route replace $address dev $interface"; - } - + emit "[ -n \"\$NOROUTES\" ] || run_ip route replace $address dev $interface"; $haveroute = 1 if $persistent; }