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

Mostly cosmetic cleanup of Shorewall::Chains

Browse Source
This commit is contained in:
Tom Eastep 2009-11-19 10:35:25 -08:00
parent de9c088972
commit a23632f45e
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall/Perl/Shorewall/Chains.pm
View File

@ -1735,11 +1735,11 @@ sub match_source_dev( $ ) {
my $interface = shift;
return '' if $interface eq '+';
my $interfaceref = known_interface( $interface );
my $physical = $interfaceref ? $interfaceref->{physical} : $interface;
$interface = $interfaceref->{physical} if $interfaceref;
if ( $interfaceref && $interfaceref->{options}{port} ) {
"-i $interfaceref->{bridge} -m physdev --physdev-in $physical ";
"-i $interfaceref->{bridge} -m physdev --physdev-in $interface ";
} else {
"-i $physical ";
"-i $interface ";
}
}
@ -1751,14 +1751,15 @@ sub match_dest_dev( $ ) {
return '' if $interface eq '+';
my $interfaceref = known_interface( $interface );
my $physical = $interfaceref ? $interfaceref->{physical} : $interface;
$interface = $interfaceref->{physical} if $interfaceref;
if ( $interfaceref && $interfaceref->{options}{port} ) {
if ( $capabilities{PHYSDEV_BRIDGE} ) {
"-o $interfaceref->{bridge} -m physdev --physdev-is-bridged --physdev-out $physical ";
"-o $interfaceref->{bridge} -m physdev --physdev-is-bridged --physdev-out $interface ";
} else {
"-o $interfaceref->{bridge} -m physdev --physdev-out $physical ";
"-o $interfaceref->{bridge} -m physdev --physdev-out $interface ";
}
} else {
"-o $physical ";
"-o $interface ";
}
}