holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Delete 'balance' and USE_DEFAULT_RT from Shorewall6

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@9104 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-12-17 22:19:49 +00:00
parent 4d8b97ac10
commit 581a8100ea
6 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Samples6/three-interfaces/shorewall6.conf
View File

@ -135,8 +135,6 @@ AUTO_COMMENT=Yes
MANGLE_ENABLED=Yes
USE_DEFAULT_RT=Yes
###############################################################################
# P A C K E T D I S P O S I T I O N
###############################################################################

2
Samples6/two-interfaces/shorewall6.conf
View File

@ -135,8 +135,6 @@ AUTO_COMMENT=Yes
MANGLE_ENABLED=Yes
USE_DEFAULT_RT=Yes
###############################################################################
# P A C K E T D I S P O S I T I O N
###############################################################################

1
Shorewall-perl/Shorewall/Config.pm
View File

@ -500,7 +500,6 @@ sub initialize( $ ) {
DONT_LOAD => '',
AUTO_COMMENT => undef,
MANGLE_ENABLED => undef ,
USE_DEFAULT_RT => undef ,
#
# Packet Disposition
#

1
Shorewall-perl/Shorewall/Providers.pm
View File

@ -284,6 +284,7 @@ sub add_a_provider( $$$$$$$$ ) {
} elsif ( $option =~ /^balance=(\d+)$/ ) {
$balance = $1;
} elsif ( $option eq 'balance' ) {
fatal_error q('balance' is not available in IPv6) if $family == F_IPV6;
$balance = 1;
} elsif ( $option eq 'loose' ) {
$loose = 1;

2
Shorewall6/shorewall6.conf
View File

@ -135,8 +135,6 @@ AUTO_COMMENT=Yes
MANGLE_ENABLED=Yes
USE_DEFAULT_RT=Yes
###############################################################################
# P A C K E T D I S P O S I T I O N
###############################################################################

26
manpages6/shorewall6-providers.xml
View File

@ -97,9 +97,7 @@
<para>The name of an existing table to duplicate to create this
routing table. May be <option>main</option> or the name of a
previously listed provider. You may select only certain entries from
the table to copy by using the COPY column below. This column should
contain a dash ("-') when USE_DEFAULT_RT=Yes in <ulink
url="shorewall6.conf.html">shorewall6.conf(5)</ulink>.</para>
the table to copy by using the COPY column below.</para>
</listitem>
</varlistentry>
@ -154,22 +152,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis
role="bold">balance[=<replaceable>weight</replaceable>]</emphasis></term>
<listitem>
<para>The providers that have <option>balance</option>
specified will get outbound traffic load-balanced among them.
By default, all interfaces with <option>balance</option>
specified will have the same weight (1). You can change the
weight of an interface by specifiying
<option>balance=</option><replaceable>weight</replaceable>
where <replaceable>weight</replaceable> is the weight of the
route out of this interface.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><emphasis role="bold">loose</emphasis></term>
@ -267,9 +249,9 @@
<para>eth2 connects to a local network.</para>
<programlisting> #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY
ISP1 1 1 main eth0 2001:ce7c:92b4:1::2 track,balance eth2
ISP2 2 2 main eth1 2001:d64c:83c9:12::8b track,balance eth2</programlisting>
<programlisting> #NAME NUMBER MARK DUPLICATE INTERFACE GATEWAY OPTIONS COPY
ISP1 1 1 main eth0 2001:ce7c:92b4:1::2 track eth2
ISP2 2 2 main eth1 2001:d64c:83c9:12::8b track eth2</programlisting>
</listitem>
</varlistentry>
</variablelist>