From c0e5fcf6c6e2c5c5f973b68cde18ab681386d344 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 22 Apr 2007 19:45:27 +0000
Subject: [PATCH] Fold IP_FORWARDING into the trivalue mechanism

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6067 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-perl/Shorewall/Config.pm | 17 ++++++-----------
 Shorewall-perl/Shorewall/Proc.pm   | 16 ++++++++--------
 Shorewall-perl/compiler.pl         |  4 ++--
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index 1abb007f8..3454b0a67 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -483,9 +483,9 @@ sub check_trivalue( $$ ) {
 
     if ( defined $val ) {
 	if ( $val eq 'yes' || $val eq 'on' ) {
-	    $config{$var} = 'yes';
+	    $config{$var} = 'on';
 	} elsif ( $val eq 'no' || $val eq 'off' ) {
-	    $config{$var} = 'no';
+	    $config{$var} = 'off';
 	} elsif ( $val eq 'keep' ) {
 	    $config{$var} = '';
 	} elsif ( $val eq '' ) {
@@ -808,15 +808,10 @@ sub get_configuration( $ ) {
 	$globals{LOGLIMIT} = '';
     }
 
-    if ( $config{IP_FORWARDING} ) {
-	fatal_error "Invalid value ( $config{IP_FORWARDING} ) for IP_FORWARDING"
-	    unless $config{IP_FORWARDING} =~ /^(On|Off|Keep)$/i;
-    } else {
-	$config{IP_FORWARDING} = 'On';
-    }
-
-    check_trivalue ( 'ROUTE_FILTER', '' );
-    check_trivalue ( 'LOG_MARTIANS', '' );
+    check_trivalue ( 'IP_FORWARDING', 'on' );
+    check_trivalue ( 'ROUTE_FILTER',  '' );
+    check_trivalue ( 'LOG_MARTIANS',  '' );
+ 
 
     default_yes_no 'ADD_IP_ALIASES'             , 'Yes';
     default_yes_no 'ADD_SNAT_ALIASES'           , '';
diff --git a/Shorewall-perl/Shorewall/Proc.pm b/Shorewall-perl/Shorewall/Proc.pm
index a1a49e806..31131f5bd 100644
--- a/Shorewall-perl/Shorewall/Proc.pm
+++ b/Shorewall-perl/Shorewall/Proc.pm
@@ -103,7 +103,7 @@ sub setup_route_filtering() {
 
 
 	if ( $config{ROUTE_FILTER} ) {
-	    my $val = $config{ROUTE_FILTER} eq 'yes' ? 1 : 0;
+	    my $val = $config{ROUTE_FILTER} eq 'on' ? 1 : 0;
 
 	    emitj ( 'for file in /proc/sys/net/ipv4/conf/*; do',
 		    "    [ -f \$file/rp_filter ] && echo $val > \$file/rp_filter",
@@ -123,9 +123,9 @@ sub setup_route_filtering() {
 
 	emit 'echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter';
 
-	if ( $config{ROUTE_FILTER} eq 'yes' ) {
+	if ( $config{ROUTE_FILTER} eq 'on' ) {
 	    emit 'echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter';
-	} elsif (  $config{ROUTE_FILTER} eq 'no' ) {
+	} elsif (  $config{ROUTE_FILTER} eq 'off' ) {
 	    emit 'echo 0 > /proc/sys/net/ipv4/conf/default/rp_filter';
 	}
 
@@ -147,7 +147,7 @@ sub setup_martian_logging() {
 	save_progress_message "Setting up Martian Logging...";
 
 	if ( $config{LOG_MARTIANS} ) {
-	    my $val = $config{LOG_MARTIANS} eq 'yes' ? 1 : 0;
+	    my $val = $config{LOG_MARTIANS} eq 'on' ? 1 : 0;
 
 	    emitj ( 'for file in /proc/sys/net/ipv4/conf/*; do',
 		    "    [ -f \$file/log_martians ] && echo $val > \$file/log_martians",
@@ -166,10 +166,10 @@ sub setup_martian_logging() {
 	    emit   "fi\n";
 	}
 
-	if ( $config{LOG_MARTIANS} eq 'yes' ) {
+	if ( $config{LOG_MARTIANS} eq 'on' ) {
 	    emit 'echo 1 > /proc/sys/net/ipv4/conf/all/log_martians';
 	    emit 'echo 1 > /proc/sys/net/ipv4/conf/default/log_martians';
-	} elsif ( $config{LOG_MARTIANS} eq 'no' ) {
+	} elsif ( $config{LOG_MARTIANS} eq 'off' ) {
 	    emit 'echo 0 > /proc/sys/net/ipv4/conf/all/log_martians';
 	    emit 'echo 0 > /proc/sys/net/ipv4/conf/default/log_martians';
 	}
@@ -204,10 +204,10 @@ sub setup_source_routing() {
 }
 
 sub setup_forwarding() {
-    if ( "\L$config{IP_FORWARDING}" eq 'on' ) {
+    if ( $config{IP_FORWARDING} eq 'on' ) {
 	emit 'echo 1 > /proc/sys/net/ipv4/ip_forward';
 	emit 'progress_message2 IP Forwarding Enabled';
-    } elsif ( "\L$config{IP_FORWARDING}" eq 'off' ) {
+    } elsif ( $config{IP_FORWARDING} eq 'off' ) {
 	emit 'echo 0 > /proc/sys/net/ipv4/ip_forward';
 	emit 'progress_message2 IP Forwarding Disabled!';
     }
diff --git a/Shorewall-perl/compiler.pl b/Shorewall-perl/compiler.pl
index 6242f956c..531dd2b30 100755
--- a/Shorewall-perl/compiler.pl
+++ b/Shorewall-perl/compiler.pl
@@ -429,10 +429,10 @@ EOF
 
     emit '';
 
-    if ( $config{IP_FORWARDING} =~ /on/i ) {
+    if ( $config{IP_FORWARDING} eq 'on' ) {
 	emitj( 'echo 1 > /proc/sys/net/ipv4/ip_forward',
 	       'progress_message2 IP Forwarding Enabled' );
-    } elsif ( $config{IP_FORWARDING} =~ /off/i ) {
+    } elsif ( $config{IP_FORWARDING} eq 'off' ) {
 	emitj( 'echo 0 > /proc/sys/net/ipv4/ip_forward',
 	       'progress_message2 IP Forwarding Disabled!'
 	       );