extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-15 12:14:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.5.8'

Browse Source
This commit is contained in:
Tom Eastep 2012-09-24 08:44:07 -07:00
commit 6d0142525c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall/Macros/macro.PPtP
View File

@ -6,7 +6,7 @@
# This macro handles PPTP traffic. # This macro handles PPTP traffic.
# #
############################################################################### ###############################################################################
?FORMAT 2 FORMAT 2
#ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/
# PORT(S) PORT(S) LIMIT GROUP # PORT(S) PORT(S) LIMIT GROUP
PARAM - - 47 PARAM - - 47

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

@ -398,11 +398,11 @@ sub process_tc_rule( ) {
} }
} }
$cmd =~ /^TTL\(([-+]?\d+)\)$/; $cmd =~ /^TTL\(([-+]?(\d+))\)$/;
my $param = $1; my $param = $1;
fatal_error "Invalid TTL specification( $cmd )" unless $param && ( $param = abs $param ) < 256; fatal_error "Invalid TTL specification( $cmd )" unless $2 && ( $param = abs $param ) < 256;
if ( $1 =~ /^\+/ ) { if ( $1 =~ /^\+/ ) {
$target .= " --ttl-inc $param"; $target .= " --ttl-inc $param";
@ -426,11 +426,11 @@ sub process_tc_rule( ) {
} }
} }
$cmd =~ /^HL\(([-+]?\d+)\)$/; $cmd =~ /^HL\(([-+]?(\d+))\)$/;
my $param = $1; my $param = $1;
fatal_error "Invalid HL specification( $cmd )" unless $param && ( $param = abs $param ) < 256; fatal_error "Invalid HL specification( $cmd )" unless $2 && ( $param = abs $param ) < 256;
if ( $1 =~ /^\+/ ) { if ( $1 =~ /^\+/ ) {
$target .= " --hl-inc $param"; $target .= " --hl-inc $param";