From 9820f84ca22b57a6f6dc23befd6cea7329eb444f Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 18 May 2007 18:13:46 +0000
Subject: [PATCH] Update home page with down server info

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6401 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/releasenotes.txt  | 34 +++++++++++++++++++-----------
 Shorewall-perl/Shorewall/Config.pm |  4 ++--
 Shorewall-perl/Shorewall/Tc.pm     |  2 +-
 Shorewall-shell/compiler           |  2 +-
 web/shorewall_index.htm            | 16 ++++++++++----
 5 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt
index 1d2559beb..24344719e 100644
--- a/Shorewall-common/releasenotes.txt
+++ b/Shorewall-common/releasenotes.txt
@@ -166,6 +166,14 @@ Migration Considerations:
        'true' value; otherwise, the compiler will assume that the script
        failed and will abort the compilation.
 
+       All scripts will need to begin with the following line:
+
+	   use Shorewall::Chains;
+
+       For more complex scripts, you may need to 'use' other Shorewall
+       Perl modules -- browse /usr/share/shorewall-perl/Shorewall/ to
+       see what's available.
+
        When a script is invoked, the $chainref scalar variable will hold a
        reference to a chain table entry. 
 
@@ -174,7 +182,7 @@ Migration Considerations:
        
            To add a rule to the chain:
 
-	      add_rule $chainref, <the rule>
+	      add_rule( $chainref, <the rule> );
 
            Where
 
@@ -183,11 +191,11 @@ Migration Considerations:
 
            Example:
 
-              add_rule $chainref, '-j ACCEPT';
+              add_rule( $chainref, '-j ACCEPT' );
 
            To insert a rule into the chain:
 
-              insert_rule $chainref, <rulenum>, <the rule>
+              insert_rule( $chainref, <rulenum>, <the rule> );
 
            The log_rule_limit function works like it does in the shell
            compiler with two exceptions:
@@ -201,16 +209,18 @@ Migration Considerations:
 
            Example:
 
-	      log_rule_limit
-	          'info' , 
-	          $chainref , 
-	          $chainref->{name},
-	          'DROP' , 
-	          '',    #Limit
-	          '' ,   #Log tag
-	          'add';	      
+	      log_rule_limit(
+	      	             'info' , 
+			      $chainref ,	     
+			      $chainref->{name},
+			      'DROP' , 
+			      '',      #Limit
+			      '' ,     #Log tag
+			      'add',   #Command
+			      '-p tcp' #Pass as-is
+                             ); 
 
-    f) The 'refresh' command is now works like 'restart' with the
+    f) The 'refresh' command now works like 'restart' with the
        following exceptions:
 
        - The refresh command is rejected if Shorewall is not running.
diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm
index e3cde8065..01f681159 100644
--- a/Shorewall-perl/Shorewall/Config.pm
+++ b/Shorewall-perl/Shorewall/Config.pm
@@ -1171,10 +1171,10 @@ sub run_user_exit( $ ) {
     if ( -f $file ) {
 	progress_message "Processing $file...";
 
-	unless (my $return = eval `cat $file`) {
+	unless (my $return = eval `cat $file` ) {
 	    fatal_error "Couldn't parse $file: $@" if $@;
 	    fatal_error "Couldn't do $file: $!"    unless defined $return;
-	    fatal_error "Couldn't run $file"       unless $return;
+	    fatal_error "Couldn't run $file";
 	}
     }
 }
diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm
index ae4e78b2a..7320f7ff5 100644
--- a/Shorewall-perl/Shorewall/Tc.pm
+++ b/Shorewall-perl/Shorewall/Tc.pm
@@ -550,7 +550,7 @@ sub setup_tc() {
 	my $mark_part = '';
 
 	if ( @routemarked_interfaces && ! $config{TC_EXPERT} ) {
-	    $mark_part = '-m mark --mark 0/0xFF00';
+	    $mark_part = $config{HIGH_ROUTE_MARKS} ? '-m mark --mark 0/0xFF00' : '-m mark --mark 0/0xFF';
 
 	    for my $interface ( @routemarked_interfaces ) {
 		add_rule $mangle_table->{PREROUTING} , "-i $interface -j tcpre";
diff --git a/Shorewall-shell/compiler b/Shorewall-shell/compiler
index 2c01184a4..310527376 100755
--- a/Shorewall-shell/compiler
+++ b/Shorewall-shell/compiler
@@ -958,7 +958,7 @@ setup_tc1() {
     # packets that are not part of a marked connection to the 'tcpre/tcout' chains.
     #
     if [ -n "$ROUTEMARK_INTERFACES" -a -z "$TC_EXPERT" ]; then
-	mark_part="-m mark --mark 0/0xFF00"
+	[ -n "$HIGH_ROUTE_MARKS" ] && mark_part="-m mark --mark 0/0xFF00" || mark_part="-m mark --mark 0/0xFF00"
 	#
 	# But let marks in tcpre override those assigned by 'track'
 	#
diff --git a/web/shorewall_index.htm b/web/shorewall_index.htm
index 26038971a..ab3e1db95 100644
--- a/web/shorewall_index.htm
+++ b/web/shorewall_index.htm
@@ -21,13 +21,14 @@ Sections, with no Front-Cover, and with no Back-Cover Texts. A copy of the
 license is included in the section entitled “<a href="GnuCopyright.htm"
 target="_self">GNU Free Documentation License</a>”.</p>
 
-<p>2007-05-17</p>
+<p>2007-05-18</p>
 <hr style="width: 100%; height: 2px;">
 
 <h2>Table of Contents</h2>
 
-<p style="margin-left: 0.42in; margin-bottom: 0in;"><a
-href="#Intro">Introduction to Shorewall</a></p>
+<p style="margin-left: 0.42in; margin-bottom: 0in;"><a href="#Server">Main
+Shorewall Server Down</a><br>
+<a href="#Intro">Introduction to Shorewall</a> </p>
 
 <p style="margin-left: 0.83in; margin-bottom: 0in;"><a
 href="#Glossary">Glossary</a><br>
@@ -42,7 +43,14 @@ href="#Glossary">Glossary</a><br>
 <a href="#OpenWRT">OpenWRT</a><br>
 <a href="#Donations">Donations</a></p>
 
-<h2><a name="Intro"></a>Introduction to Shorewall</h2>
+<h3>Main Shorewall Server Down</h3>
+
+<p style="margin-left: 0.42in;">The server that hosts www.shorewall.net and ftp.shorewall.net is currently
+down and a backup server with limited bandwidth has been pressed into
+service. Please use <a href="shorewall_mirrors.htm">Mirrors</a> whenever
+possible. </p>
+
+<p style="margin-left: 0.42in;">Thanks!</p>
 
 <h3><a name="Glossary"></a>Glossary</h3>
 <ul>