From 432da14c4b9a01a2bd6cc9848340bca11baa10f3 Mon Sep 17 00:00:00 2001 From: teastep Date: Mon, 5 Apr 2004 17:41:02 +0000 Subject: [PATCH] Fix display of ICMP type 3's git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1241 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall2/changelog.txt | 2 ++ Shorewall2/releasenotes.txt | 10 +++------- Shorewall2/shorewall | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 9f4b806f9..666c63b2d 100644 --- a/Shorewall2/changelog.txt +++ b/Shorewall2/changelog.txt @@ -36,3 +36,5 @@ Changes since 2.0.0 17) Reduce useless intra-zone rules on bridges. 18) Make 'routeback' on hosts work again. + +19) Fix display of ICMP packets. diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index ad5c5ec0f..cc2f9bee0 100755 --- a/Shorewall2/releasenotes.txt +++ b/Shorewall2/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 2.0.1-RC5 +Shorewall 2.0.1 ---------------------------------------------------------------------- Problems Corrected since 2.0.0 @@ -13,12 +13,8 @@ Problems Corrected since 2.0.0 3) Thanks to Sean Mathews, a long-standing problem with Proxy ARP and IPSEC has been corrected. Thanks Sean!!! -Problems Corrected since 2.0.1 RC4 - -1) The 'routeback' hosts option now works again. - -2) When two bridge ports are assigned to the same zone, Shorewall now - correctly creates rules allowing traffic between them. +4) The "shorewall show log" and "shorewall logwatch" commands + incorrectly displayed type 3 ICMP packets. ----------------------------------------------------------------------- Issues when migrating from Shorewall 2.0.0 to Shorewall 2.0.1: diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall index 6af1f0ffb..90185f2d9 100755 --- a/Shorewall2/shorewall +++ b/Shorewall2/shorewall @@ -289,7 +289,7 @@ packet_log() # $1 = number of messages sed s/" kernel:"// | \ sed s/" $host $LOGFORMAT"/" "/ | \ sed s/" $host kernel: ipt_unclean: "/" "/ | \ - sed 's/MAC=.*SRC=/SRC=/' | \ + sed 's/MAC=.* SRC=/SRC=/' | \ tail $options }