mirror of
https://gitlab.com/shorewall/code.git
synced 2025-01-11 08:08:12 +01:00
Merge branch '5.2.3'
This commit is contained in:
commit
c127cec76c
@ -4991,10 +4991,10 @@ sub do_proto( $$$;$ )
|
|||||||
|
|
||||||
$invert = $sports =~ s/^!// ? '! ' : '';
|
$invert = $sports =~ s/^!// ? '! ' : '';
|
||||||
|
|
||||||
if ( $ports =~ /^\+/ ) {
|
if ( $sports =~ /^\+/ ) {
|
||||||
$output .= $invert;
|
$output .= $invert;
|
||||||
$output .= '-m set ';
|
$output .= '-m set ';
|
||||||
$output .= get_set_flags( $ports, 'src' );
|
$output .= get_set_flags( $sports, 'src' );
|
||||||
} elsif ( $multiport ) {
|
} elsif ( $multiport ) {
|
||||||
if ( port_count( $sports ) > 15 ) {
|
if ( port_count( $sports ) > 15 ) {
|
||||||
if ( $restricted ) {
|
if ( $restricted ) {
|
||||||
@ -5207,8 +5207,8 @@ sub do_iproto( $$$ )
|
|||||||
fatal_error "'=' in the SOURCE PORT(S) column requires one or more ports in the DEST PORT(S) column" if $sports eq '=';
|
fatal_error "'=' in the SOURCE PORT(S) column requires one or more ports in the DEST PORT(S) column" if $sports eq '=';
|
||||||
$invert = $sports =~ s/^!// ? '! ' : '';
|
$invert = $sports =~ s/^!// ? '! ' : '';
|
||||||
|
|
||||||
if ( $ports =~ /^\+/ ) {
|
if ( $sports =~ /^\+/ ) {
|
||||||
push @output, set => ${invert} . get_set_flags( $ports, 'src' );
|
push @output, set => ${invert} . get_set_flags( $sports, 'src' );
|
||||||
} elsif ( $multiport ) {
|
} elsif ( $multiport ) {
|
||||||
if ( port_count( $sports ) > 15 ) {
|
if ( port_count( $sports ) > 15 ) {
|
||||||
if ( $restricted ) {
|
if ( $restricted ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user