From acc389ff68e9a3024f7a3fe1a35c3c4abacb472d Mon Sep 17 00:00:00 2001 From: teastep Date: Fri, 8 Oct 2004 00:17:55 +0000 Subject: [PATCH] Add AllowICMPs action and invoke from Drop and Reject git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1668 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 +- Shorewall2/firewall | 10 +++++++--- Shorewall2/releasenotes.txt | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 40c06e0b0..f6e39febc 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -96,4 +96,4 @@ Changes since 2.0.3 46) Implement 'sourceroute' interface option. -47) Add 'icmps' action. +47) Add 'AllowICMPs' action. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index 667236589..3ab674d64 100755 --- a/Shorewall2/firewall +++ b/Shorewall2/firewall @@ -2363,11 +2363,15 @@ setup_tc1() { run_iptables -t mangle -A OUTPUT -j tcout run_iptables -t mangle -A POSTROUTING -j tcpost - run_user_exit tcstart + f=$(find_file tcstart) - save_progress_message "Restoring Traffic Control..." - save_command . $(find_file tcstart) + if [ -f $f ]; then + run_user_exit tcstart + + save_progress_message "Restoring Traffic Control..." + save_command . $(find_file tcstart) + fi } setup_tc() { diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 22e313229..81bd0ae83 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -67,6 +67,11 @@ Problems corrected since 2.1.9 1) With DELAYBLACKLISTLOAD=No, the blacklist was previously not loaded. +Problems corrected since 2.1.10 + +1) If TC_ENABLED=Yes but you have no /etc/shorewall/tcstart file then + "shorewall restore" will no longer attempt to run the tcstart file. + ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0 to Shorewall 2.1: