mirror of
https://gitlab.com/shorewall/code.git
synced 2025-02-18 18:51:00 +01:00
Simplify an RE
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8473 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
039a875b70
commit
03f93c1f5b
@ -1419,14 +1419,14 @@ sub get_set_flags( $$ ) {
|
|||||||
sub match_source_net( $;$ ) {
|
sub match_source_net( $;$ ) {
|
||||||
my ( $net, $restriction) = @_;
|
my ( $net, $restriction) = @_;
|
||||||
|
|
||||||
$restriction ||= NO_RESTRICT;
|
$restriction |= NO_RESTRICT;
|
||||||
|
|
||||||
if ( $net =~ /^(!?)(\d+\.\d+\.\d+\.\d+)-(\d+\.\d+\.\d+\.\d+)$/ ) {
|
if ( $net =~ /^(!?)(\d+\.\d+\.\d+\.\d+)-(\d+\.\d+\.\d+\.\d+)$/ ) {
|
||||||
my ($addr1, $addr2) = ( $2, $3 );
|
my ($addr1, $addr2) = ( $2, $3 );
|
||||||
$net =~ s/!// if my $invert = $1 ? '! ' : '';
|
$net =~ s/!// if my $invert = $1 ? '! ' : '';
|
||||||
validate_range $addr1, $addr2;
|
validate_range $addr1, $addr2;
|
||||||
iprange_match . "${invert}--src-range $net ";
|
iprange_match . "${invert}--src-range $net ";
|
||||||
} elsif ( $net =~ /^(!?)~(.*)$/ ) {
|
} elsif ( $net =~ /^!?~.*$/ ) {
|
||||||
fatal_error "MAC address cannot be used in this context" if $restriction >= OUTPUT_RESTRICT;
|
fatal_error "MAC address cannot be used in this context" if $restriction >= OUTPUT_RESTRICT;
|
||||||
mac_match $net;
|
mac_match $net;
|
||||||
} elsif ( $net =~ /^(!?)\+/ ) {
|
} elsif ( $net =~ /^(!?)\+/ ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user