extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-01-20 12:39:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow networks to be specified in a NETMAP rule

Browse Source
This commit is contained in:
Tom Eastep 2010-06-12 13:50:58 -07:00
parent 9acec39898
commit d58127e51c
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,9 @@ sub setup_netmap() {
while ( read_a_line ) { while ( read_a_line ) {
my ( $type, $net1, $interfacelist, $net2 ) = split_line 4, 4, 'netmap file'; my ( $type, $net1, $interfacelist, $net2, $net3 ) = split_line 4, 5, 'netmap file';
$net3 = ALLIP if $net3 eq '-';
for my $interface ( split_list $interfacelist, 'interface' ) { for my $interface ( split_list $interfacelist, 'interface' ) {
@ -459,8 +461,8 @@ sub setup_netmap() {
fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface ); fatal_error "Unknown interface ($interface)" unless my $interfaceref = known_interface( $interface );
unless ( $interfaceref->{root} ) { unless ( $interfaceref->{root} ) {
$rulein = match_source_dev $interface; $rulein = match_source_dev( $interface ) . match_source_net ( $net3 );
$ruleout = match_dest_dev $interface; $ruleout = match_dest_dev( $interface ) . match_dest_net ( $net3 );
$interface = $interfaceref->{name}; $interface = $interfaceref->{name};
} }

2
Shorewall/configfiles/netmap
View File

@ -7,4 +7,4 @@
# information. # information.
# #
############################################################################### ###############################################################################
#TYPE NET1 INTERFACE NET2 #TYPE NET1 INTERFACE NET2 NET3

11
manpages/shorewall-netmap.xml
View File

@ -87,6 +87,17 @@
<para>Network in CIDR format</para> <para>Network in CIDR format</para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><emphasis role="bold">NET3 (Optional)</emphasis> -
<emphasis>network-address</emphasis></term>
<listitem>
<para>If specified, qualifies INTERFACE. It specifies a SOURCE
network for DNAT rules and a DESTINATON network for SNAT
rules.</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</refsect1> </refsect1>