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

Fix provider number in masq entry

Browse Source
This commit is contained in:
Tom Eastep 2009-08-12 13:52:56 -07:00
parent f056faa6c4
commit 2bac824207
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Perl/Shorewall/Nat.pm
View File

@ -197,7 +197,7 @@ sub process_one_masq( )
$interface = $1;
my $provider = $2;
$fullinterface =~ s/[(]\w*[)]//;
my $realm = lookup_provider( $provider ) unless $provider =~ /^\d+$/;
my $realm = lookup_provider( $provider );
fatal_error "$provider is not a shared-interface provider" unless $realm;

1
Shorewall/Perl/Shorewall/Providers.pm
View File

@ -780,7 +780,6 @@ sub lookup_provider( $ ) {
fatal_error "Unknown provider ($provider)" unless $providerref;
}
$providerref->{shared} ? $providerref->{number} : 0;
}

6
Shorewall/changelog.txt
View File

@ -6,6 +6,12 @@ Changes in Shorewall 4.4.0
3) Fix log record formatting.
4) Restore ipset binding
5) Fix 'upnpclient' with required interfaces.
5) Fix provider number in
Changes in Shorewall 4.4.0-RC2
1) Fix capabilities file with Shorewall6.

9
Shorewall/releasenotes.txt
View File

@ -188,6 +188,15 @@ Shorewall 4.4.0
5) The 'upnpclient' option only worked correctly if 'optional' was
also specified for the interface.
6) Where more than one internet provider shares the same external
interface, specifying the provider by number in /etc/shorewall/masq
(e.g., eth1(2)) resulted in the fatal compilation error:
ERROR: 2 is not a shared-interface provider
Also, the shorewall-masq (5) man page did not describe the syntax
for specifying the provider.
----------------------------------------------------------------------------
K N O W N P R O B L E M S R E M A I N I N G
----------------------------------------------------------------------------

12
manpages/shorewall-masq.xml
View File

@ -70,6 +70,16 @@
entry that defines <filename
class="devicefile">ppp+</filename>.</para>
<para>Where <ulink url="MultiISP.html#Shared">more that one internet
providers shares a single interface</ulink>, the provider is
specified by including the provider name or number in
parentheses:</para>
<programlisting> eth0(Avvanta)</programlisting>
<para>In that case, you will want to specify the interfaces's
address for that provider in the ADDRESS column.</para>
<para>The interface may be qualified by adding the character ":"
followed by a comma-separated list of destination host or subnet
addresses to indicate that you only want to change the source IP
@ -80,7 +90,7 @@
<para>If you wish to inhibit the action of ADD_SNAT_ALIASES for this
entry then include the ":" but omit the digit:</para>
<programlisting> eth0:
<programlisting> eth0(Avvanta):
eth2::192.0.2.32/27</programlisting>
<para>Normally Masq/SNAT rules are evaluated after those for