extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-30 19:43:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler detection of FWMARK_RT_MASK

Browse Source
This commit is contained in:
Tom Eastep 2010-07-05 08:39:32 -07:00
parent 542557069e
commit 0e87ccbcfd
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,6 +289,7 @@ our $sillyname; # Name of temporary filter chains for testing capa
our $sillyname1; our $sillyname1;
our $iptables; # Path to iptables/ip6tables our $iptables; # Path to iptables/ip6tables
our $tc; # Path to tc our $tc; # Path to tc
our $ip; # Path to ip
use constant { MIN_VERBOSITY => -1, use constant { MIN_VERBOSITY => -1,
MAX_VERBOSITY => 2 , MAX_VERBOSITY => 2 ,
@ -2424,7 +2425,7 @@ sub Flow_Filter() {
} }
sub Fwmark_Rt_Mask() { sub Fwmark_Rt_Mask() {
$tc && system( "$tc rule add help 2>&1 | grep -q /MARK" ) == 0; $ip && system( "$ip rule add help 2>&1 | grep -q MARK" ) == 0;
} }
our %detect_capability = our %detect_capability =
@ -2753,12 +2754,18 @@ sub get_capabilities( $ ) {
fatal_error "$iptables_restore does not exist or is not executable" unless -x $iptables_restore; fatal_error "$iptables_restore does not exist or is not executable" unless -x $iptables_restore;
$tc = $config{TC}; $tc = $config{TC} || which 'tc';
if ( $tc ) { if ( $tc ) {
fatal_error "TC=$tc does not exist or is not executable" unless -x $tc; fatal_error "TC=$tc does not exist or is not executable" unless -x $tc;
} }
$ip = $config{IP} || which 'ip';
if ( $ip ) {
fatal_error "IP=$ip does not exist or is not executable" unless -x $ip;
}
load_kernel_modules; load_kernel_modules;
if ( open_file 'capabilities' ) { if ( open_file 'capabilities' ) {