diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index ad525cd12..0a4f8621f 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -6,6 +6,8 @@ Changes in Shorewall 4.3.4 3) Improve chain-combining optimizations. +4) Make connection and log displays address family specific. + Changes in Shorewall 4.3.3 1) Removed 'ecn'. diff --git a/Shorewall-common/lib.cli b/Shorewall-common/lib.cli index 7d0d1ea53..685d8c657 100644 --- a/Shorewall-common/lib.cli +++ b/Shorewall-common/lib.cli @@ -154,9 +154,9 @@ packet_log() # $1 = number of messages local options if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then - $LOGREAD | grep 'IN=.* OUT=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ + $LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ else - $LOGREAD | grep 'IN=.* OUT=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ + $LOGREAD | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ fi } diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 555adb076..68bc0e1c6 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -57,6 +57,11 @@ Other Changes in 4.3.4 output of 'shorewall show connections', 'shorewall-lite show connections', 'shorewall dump' and 'shorewall-lite dump'. +2) The Shorewall and Shorewall lite commands that show log messages + ('shorewall show log', ...) now show only IPv4 messages. The + corresponding commands in Shorewall6 and Shorewall6 Lite only show + IPv6 messages. + Migration Issues. None. diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli index ef24fd37e..bc32413ab 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -135,9 +135,9 @@ packet_log() # $1 = number of messages local options if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then - $LOGREAD | grep 'IN=.* OUT=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ + $LOGREAD | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | head -n$1 | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ else - $LOGREAD | grep 'IN=.* OUT=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ + $LOGREAD | grep 'IN=.* OUT=.*SRC=.*:.*DST=' | head -n$1 | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ fi }