Extend 'show log <ipaddr>' to search for a regular expression.

Signed-off-by: Tom Eastep <teastep@shorewall.net>

Shorewall-lite/shorewall-lite

@@ -376,7 +376,7 @@ usage() # $1 = exit status
     echo "   show connections"
     echo "   show filters"
     echo "   show ip"
-    echo "   show [ -m ] log [<ip address>]"
+    echo "   show [ -m ] log [<regex>]"
     echo "   show [ -x ] mangle|nat|raw|routing"
     echo "   show policies"
     echo "   show tc [ device ]"

Shorewall/releasenotes.txt

@@ -336,10 +336,10 @@ None.
     duplicate chains. So to set all possible optimizations, specify
     OPTIMIZE=15.
 
-5)  /sbin/shorewall and /sbin/shorewall-lite now support 'show log
+5)  The command-line tools now support 'show log <regex>' where <regex>
-    <ipaddr>' where <ipaddr> is an IP address. The command searches the
+    is a regular expression to search for in the LOGFILE. The command
-    current LOGFILE for Netfilter messages containing the supplied
+    searches the current LOGFILE for Netfilter messages matching the
-    address.
+    supplied regex.
 
 ----------------------------------------------------------------------------
 V I.  P R O B L E M S  C O R R E C T E D  A N D  N E W   F E A T U R E S

Shorewall/shorewall

@@ -1360,7 +1360,7 @@ usage() # $1 = exit status
     echo "   show dynamic <zone>"
     echo "   show filters"
     echo "   show ip"
-    echo "   show [ -m ] log [<ip address>]"
+    echo "   show [ -m ] log [<regex>]"
     echo "   show macro <macro>"
     echo "   show macros"
     echo "   show [ -x ] mangle|nat|raw|routing"

Shorewall6-lite/shorewall6-lite

@@ -364,7 +364,7 @@ usage() # $1 = exit status
     echo "   restart [ -n ] [ -f ]"
     echo "   restore [ -n ] [ <file name> ]"
     echo "   save [ <file name> ]"
-    echo "   show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [<chain> [ <chain> ... ]capabilities|classifiers|config|connections|filters|ip|log|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]"
+    echo "   show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [<chain> [ <chain> ... ]capabilities|classifiers|config|connections|filters|ip|log [<regex>]|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]"
     echo "   start [ -f ] [ <directory> ]"
     echo "   stop [ -f ]"
     echo "   status"

Shorewall6/lib.cli

@@ -140,6 +140,15 @@ packet_log() # $1 = number of messages
     fi
 }
 
+search_log() # $1 = IP address to search for
+{
+    if [ -n "$g_showmacs" -o $VERBOSITY -gt 2 ]; then
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' | grep "$1" | tac | sed 's/ kernel://; s/\[.*\] //' | sed s/" $host $LOGFORMAT"/" "/
+    else
+	$g_logread | grep 'IN=.* OUT=.*SRC=.*\..*DST=' |  grep "$1" | tac | sed 's/ kernel://; s/MAC=.* SRC=/SRC=/; s/\[.*\] '// | sed s/" $host $LOGFORMAT"/" "/
+    fi
+}    
+
 #
 # Show traffic control information
 #
@@ -447,12 +456,17 @@ show_command() {
 	    $IP6TABLES -t raw -L $g_ipt_options
 	    ;;
 	log)
-	    [ $# -gt 1 ] && usage 1
+	    [ $# -gt 2 ] && usage 1
 	    echo "$g_product $SHOREWALL_VERSION Log ($LOGFILE) at $g_hostname - $(date)"
 	    echo
 	    show_reset
 	    host=$(echo $g_hostname | sed 's/\..*$//')
-	    packet_log 20
+
+	    if [ $# -eq 2 ]; then
+		search_log $2
+	    else
+		packet_log 20
+	    fi
 	    ;;
 	tc)
 	    [ $# -gt 2 ] && usage 1

Shorewall6/shorewall6

@@ -1282,7 +1282,7 @@ usage() # $1 = exit status
     echo "   restart [ -n ] [ -f ] [ <directory> ]"
     echo "   restore [ -n ] [ <file name> ]"
     echo "   save [ <file name> ]"
-    echo "   show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [<chain> [ <chain> ... ]|actions|capabilities|classifiers|config|connections|filters|ip|log|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]"
+    echo "   show [ -x ] [ -m ] [-f] [ -t {filter|mangle} ] [ {chain [<chain> [ <chain> ... ]|actions|capabilities|classifiers|config|connections|filters|ip|log [<regex>]|macros|mangle|nat|policies|raw|routing|tc|vardir|zones} ]"
     echo "   start [ -f ] [ -n ] [ <directory> ]"
     echo "   stop [ -f ]"
     echo "   status"