From 07c21b8968a7849b0eb2023ade6a3f5b25d51305 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 6 Jan 2015 09:06:27 -0800
Subject: [PATCH] Add 'primary' provider option

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Providers.pm        |  3 ++-
 Shorewall/manpages/shorewall-providers.xml   | 13 +++++++++++++
 Shorewall6/manpages/shorewall6-providers.xml | 17 +++++++++++++++--
 docs/MultiISP.xml                            | 13 +++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm
index 064569e1f..fb0be3368 100644
--- a/Shorewall/Perl/Shorewall/Providers.pm
+++ b/Shorewall/Perl/Shorewall/Providers.pm
@@ -530,8 +530,9 @@ sub process_a_provider( $ ) {
 		$track = 0;
 	    } elsif ( $option =~ /^balance=(\d+)$/ ) {
 		fatal_error q('balance=<weight>' is not available in IPv6) if $family == F_IPV6;
+		fatal_error 'The balance setting must be non-zero' unless $1;
 		$balance = $1;
-	    } elsif ( $option eq 'balance' ) {
+	    } elsif ( $option eq 'balance' || $option eq 'primary') {
 		$balance = 1;
 	    } elsif ( $option eq 'loose' ) {
 		$loose   = 1;
diff --git a/Shorewall/manpages/shorewall-providers.xml b/Shorewall/manpages/shorewall-providers.xml
index fb74de032..67985a6fe 100644
--- a/Shorewall/manpages/shorewall-providers.xml
+++ b/Shorewall/manpages/shorewall-providers.xml
@@ -255,6 +255,19 @@
               </listitem>
             </varlistentry>
 
+            <varlistentry>
+              <term><emphasis role="bold">primary</emphasis></term>
+
+              <listitem>
+                <para>Added in Shorewall 4.6.6, <emphasis
+                role="bold">primary</emphasis> is equivalent to <emphasis
+                role="bold">balance=1</emphasis> and is preferred when the
+                remaining providers specify <emphasis
+                role="bold">fallback</emphasis> or <emphasis
+                role="bold">tproxy</emphasis>.</para>
+              </listitem>
+            </varlistentry>
+
             <varlistentry>
               <term><emphasis
               role="bold">src=</emphasis><replaceable>source-address</replaceable></term>
diff --git a/Shorewall6/manpages/shorewall6-providers.xml b/Shorewall6/manpages/shorewall6-providers.xml
index a8c29a0a7..89f096c33 100644
--- a/Shorewall6/manpages/shorewall6-providers.xml
+++ b/Shorewall6/manpages/shorewall6-providers.xml
@@ -162,8 +162,8 @@
                 this provider's gateway to be added to the <emphasis
                 role="bold">main</emphasis> routing table (USE_DEFAULT_RT=No)
                 or to the <emphasis role="bold">balance</emphasis> routing
-                table (USE_DEFAULT_RT=Yes). At most one provider can specify
-                this option.</para>
+                table (USE_DEFAULT_RT=Yes). Only one provider can specify this
+                option.</para>
               </listitem>
             </varlistentry>
 
@@ -248,6 +248,19 @@
               </listitem>
             </varlistentry>
 
+            <varlistentry>
+              <term><emphasis role="bold">primary</emphasis></term>
+
+              <listitem>
+                <para>Added in Shorewall 4.6.6, <emphasis
+                role="bold">primary</emphasis> is a synonym for <emphasis
+                role="bold">balance</emphasis> (see above) and is preferred
+                when the remaining providers specify <emphasis
+                role="bold">fallback</emphasis> or <emphasis
+                role="bold">tproxy</emphasis>.</para>
+              </listitem>
+            </varlistentry>
+
             <varlistentry>
               <term>src=<replaceable>source-address</replaceable></term>
 
diff --git a/docs/MultiISP.xml b/docs/MultiISP.xml
index 8dceec00d..7e2d07ab2 100644
--- a/docs/MultiISP.xml
+++ b/docs/MultiISP.xml
@@ -503,6 +503,19 @@
                 </listitem>
               </varlistentry>
 
+              <varlistentry>
+                <term>primary</term>
+
+                <listitem>
+                  <para>Added in Shorewall 4.6.6, <emphasis
+                  role="bold">primary</emphasis> is a synonym for <emphasis
+                  role="bold">balance=1</emphasis> and is preferred when the
+                  remaining providers specify <emphasis
+                  role="bold">fallback</emphasis> or <emphasis
+                  role="bold">tproxy</emphasis>.</para>
+                </listitem>
+              </varlistentry>
+
               <varlistentry>
                 <term>src=<replaceable>source-address</replaceable></term>