From e1309b06b18f713aa36dc9d7e876a0dae3c79209 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sun, 23 Sep 2012 12:19:41 -0700 Subject: [PATCH 1/2] Correct PPTP Macro Signed-off-by: Tom Eastep --- Shorewall/Macros/macro.PPtP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shorewall/Macros/macro.PPtP b/Shorewall/Macros/macro.PPtP index b4ba427e8..c126707b6 100644 --- a/Shorewall/Macros/macro.PPtP +++ b/Shorewall/Macros/macro.PPtP @@ -6,7 +6,7 @@ # This macro handles PPTP traffic. # ############################################################################### -?FORMAT 2 +FORMAT 2 #ACTION SOURCE DEST PROTO DEST SOURCE RATE USER/ # PORT(S) PORT(S) LIMIT GROUP PARAM - - 47 From cf130a7e1646bbb95604fddb20463502925b3f90 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Mon, 24 Sep 2012 07:14:44 -0700 Subject: [PATCH 2/2] Correct handling of {+-}0 in the TTL and HL tcrule actions. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index 9d00cfa03..338388bab 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -394,11 +394,11 @@ sub process_tc_rule( ) { } } - $cmd =~ /^TTL\(([-+]?\d+)\)$/; + $cmd =~ /^TTL\(([-+]?(\d+))\)$/; 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 =~ /^\+/ ) { $target .= " --ttl-inc $param"; @@ -422,11 +422,11 @@ sub process_tc_rule( ) { } } - $cmd =~ /^HL\(([-+]?\d+)\)$/; + $cmd =~ /^HL\(([-+]?(\d+))\)$/; 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 =~ /^\+/ ) { $target .= " --hl-inc $param";