From 70d08f97f67e75a3397871cf35a0a4ad80b8b761 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 2 Jan 2016 12:36:38 -0800 Subject: [PATCH 1/3] Support the DROP command in the mangle file Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Tc.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Shorewall/Perl/Shorewall/Tc.pm b/Shorewall/Perl/Shorewall/Tc.pm index dde22293e..0e0af96bd 100644 --- a/Shorewall/Perl/Shorewall/Tc.pm +++ b/Shorewall/Perl/Shorewall/Tc.pm @@ -452,6 +452,16 @@ sub process_mangle_rule1( $$$$$$$$$$$$$$$$$$ ) { }, }, + DROP => { + defaultchain => 0, + allowedchains => PREROUTING | FORWARD | OUTPUT | POSTROUTING, + minparams => 0, + maxparams => 0, + function => sub() { + $target = 'DROP'; + } + }, + DSCP => { defaultchain => 0, allowedchains => PREROUTING | FORWARD | OUTPUT | POSTROUTING, From ae9a4e3b83bdc5fb920f41a6245685b72a58ed61 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Sat, 12 Dec 2015 08:10:34 -0800 Subject: [PATCH 2/3] Accept host=debian.* in the configure scripts (Matt Darfeuille) Signed-off-by: Tom Eastep --- Shorewall-core/configure | 3 +++ Shorewall-core/configure.pl | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Shorewall-core/configure b/Shorewall-core/configure index a710682b3..33e9138cd 100755 --- a/Shorewall-core/configure +++ b/Shorewall-core/configure @@ -169,6 +169,9 @@ else elif [ $vendor = default ]; then params[HOST]=linux vendor=linux + elif [[ $vendor == debian.* ]]; then + params[HOST]=debian + vendor=debian fi fi diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl index 6dbb8f70b..440bfc9ac 100755 --- a/Shorewall-core/configure.pl +++ b/Shorewall-core/configure.pl @@ -102,6 +102,8 @@ if ( defined $vendor ) { die qq("ERROR: $vendor" is not a recognized host type); } elsif ( $vendor eq 'default' ) { $params{HOST} = $vendor = 'linux'; + } elsif ( $vendor =~ /^debian\./ ) { + $params{HOST} = $vendor = 'debian'; } } else { if ( -f '/etc/debian_version' ) { From 505f2838fe9640ef41da641a92fa6201d7a8364a Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Fri, 11 Dec 2015 14:37:52 -0800 Subject: [PATCH 3/3] Another fix to configure.pl from Matt Darfeuille Signed-off-by: Tom Eastep --- Shorewall-core/configure.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Shorewall-core/configure.pl b/Shorewall-core/configure.pl index 440bfc9ac..818cdfd18 100755 --- a/Shorewall-core/configure.pl +++ b/Shorewall-core/configure.pl @@ -109,8 +109,8 @@ if ( defined $vendor ) { if ( -f '/etc/debian_version' ) { $vendor = 'debian'; if ( -l '/sbin/init' ) { - if ( readlink '/sbin/init' =~ /systemd/ ) { - $rcfilename = 'debian.systemd'; + if ( readlink( '/sbin/init' ) =~ /systemd/ ) { + $rcfilename = 'shorewallrc.debian.systemd'; } else { $rcfilename = 'shorewallrc.debian.sysvinit'; }