diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index a2c8d1c68..12f0d4a14 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -2,6 +2,9 @@ Changes in 3.4.0 Beta 1 1) Correct handling of masq file. +2) Simplify log record processing and remove more noise from the + displayed record. + Changes in 3.3.6 1) Remove /etc/shorewall/Documentation. diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli index 8ac79d255..1dd51654d 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -150,16 +150,9 @@ packet_log() # $1 = number of messages [ -n "$realtail" ] && options="-n$1" if [ -n "$SHOWMACS" -o $VERBOSE -gt 2 ]; then - $LOGREAD | grep 'IN=.* OUT=' | \ - sed s/" kernel:"// | \ - sed s/" $host $LOGFORMAT"/" "/ | \ - tail $options + $LOGREAD | grep 'IN=.* OUT=' | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/ | tail $options else - $LOGREAD | grep 'IN=.* OUT=' | \ - sed s/" kernel:"// | \ - sed s/" $host $LOGFORMAT"/" "/ | \ - sed 's/MAC=.* SRC=/SRC=/' | \ - tail $options + $LOGREAD | grep 'IN=.* OUT=' | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/ | tail $options fi }