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

Add undocumented LOGICAL_NAMES option

Browse Source
This commit is contained in:
Tom Eastep 2009-11-09 07:01:25 -08:00
parent dda6f06883
commit 92208251b7
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall/Perl/Shorewall/Config.pm
View File

@ -440,6 +440,7 @@ sub initialize( $ ) {
AUTOMAKE => undef ,
WIDE_TC_MARKS => undef,
TRACK_PROVIDERS => undef,
LOGICAL_NAMES => undef,
#
# Packet Disposition
#
@ -547,6 +548,7 @@ sub initialize( $ ) {
AUTOMAKE => undef ,
WIDE_TC_MARKS => undef,
TRACK_PROVIDERS => undef,
LOGICAL_NAMES => undef,
#
# Packet Disposition
#
@ -2407,6 +2409,7 @@ sub get_configuration( $ ) {
default_yes_no 'AUTOMAKE' , '';
default_yes_no 'WIDE_TC_MARKS' , '';
default_yes_no 'TRACK_PROVIDERS' , '';
default_yes_no 'LOGICAL_NAMES' , '';
$capabilities{XCONNMARK} = '' unless $capabilities{XCONNMARK_MATCH} and $capabilities{XMARK};

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

@ -893,7 +893,7 @@ sub process_interface( $ ) {
if ( $option eq 'physical' ) {
fatal_error "Invalid Physical interface name ($value)" unless $value =~ /^[\w.@%-]+\+?$/;
# fatal_error "The 'physical' option is only allowed on bridge ports" unless $port;
fatal_error "The 'physical' option is only allowed on bridge ports" unless $port || $config{LOGICAL_NAMES};
my $wildphy = $value =~ /\+$/ ? 1 : 0;
fatal_error "The type of 'physical' name ($value) doesn't match the type of interface name ($interface)" unless $wildphy == $wildcard;
$physical = $value;