Allow non-experts to use the user bits in the fw mark

Signed-off-by: Tom Eastep <teastep@shorewall.net>
Move a line of code
2015-09-07 11:35:47 -07:00 · 2015-09-06 10:33:09 -07:00 · 2015-09-06 10:29:36 -07:00
2 changed files with 8 additions and 2 deletions
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -4855,7 +4855,7 @@ sub validate_mark( $ ) {

 sub verify_small_mark( $ ) {
    my $val = validate_mark ( (my $mark) = $_[0] );
-    fatal_error "Mark value ($mark) too large" if numeric_value( $mark ) > $globals{TC_MAX};
+    fatal_error "Mark value ($mark) too large" if numeric_value( $mark ) > $globals{SMALL_MASK};
    $val;
 }

--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -5677,7 +5677,9 @@ sub get_configuration( $$$$$ ) {
 	fatal_error "LOG_MARTIANS=On is not supported in IPv6" if $config{LOG_MARTIANS} eq 'on';
    }

-    default 'STARTUP_LOG'   , '';
+    default 'SHOREWALL_SHELL', '/bin/sh';
+
+    default 'STARTUP_LOG'    , '';

    if ( $config{STARTUP_LOG} ne '' ) {
 	if ( supplied $config{LOG_VERBOSITY} ) {
@@ -5900,6 +5902,10 @@ sub get_configuration( $$$$$ ) {
 	$globals{USER_MASK} = $globals{USER_BITS} = 0;
    }

+    $val = $config{PROVIDER_OFFSET};
+
+    $globals{SMALL_MASK} = $val ? make_mask( $val ) : $globals{TC_MASK}; 
+
    if ( supplied ( $val = $config{ZONE2ZONE} ) ) {
 	fatal_error "Invalid ZONE2ZONE value ( $val )" unless $val =~ /^[2-]$/;
    } else {
Author	SHA1	Message	Date
Tom Eastep	0aa5cb5086	Allow non-experts to use the user bits in the fw mark Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-07 11:35:47 -07:00
Tom Eastep	eddd58d459	Move a line of code Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:33:09 -07:00
Tom Eastep	1bf13e5fda	Provide default for SHOREWALL_SHELL Signed-off-by: Tom Eastep <teastep@shorewall.net>	2015-09-06 10:29:36 -07:00