From d02725a7cb6561add0621017539c932d9f82a938 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Fri, 24 Sep 2004 22:07:08 +0000
Subject: [PATCH] Fix martian logging; add /proc to status output

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1646 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/firewall  |  9 +++++----
 Shorewall2/shorewall | 18 +++++++++++++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 6965fbc1c..152146345 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5866,6 +5866,7 @@ add_common_rules() {
 
 	if [ -n "$ROUTE_FILTER" ]; then
 	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter"
+	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
 	fi
 
 	run_and_save_command ip route flush cache
@@ -5886,7 +5887,7 @@ add_common_rules() {
 	done
 
 	for interface in $interfaces; do
-	    file=/proc/sys/net/ipv4/conf/$interface/log_martians
+	    file/=proc/sys/net/ipv4/conf/$interface/log_martians
 	    if [ -f $file ]; then
 		run_and_save_command "echo 1 > $file"
 	    else
@@ -5895,9 +5896,9 @@ add_common_rules() {
 	    fi
 	done
 
-	if [ -n "$ROUTE_FILTER" ]; then
-	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter"
-	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter"
+	if [ -n "$LOG_MARTIANS" ]; then
+	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/default/log_martians"
+	    run_and_save_command "echo 1 > /proc/sys/net/ipv4/conf/all/log_martians"
 	fi
 
     fi
diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall
index 603605862..c87a64346 100755
--- a/Shorewall2/shorewall
+++ b/Shorewall2/shorewall
@@ -619,6 +619,10 @@ show_reset() {
 	echo
 }
 
+show_proc() {
+    echo "   $1 = $(cat $1)"
+}
+
 #
 # Execution begins here
 #
@@ -863,7 +867,7 @@ case "$1" in
 	    [ $# -gt 2 ] && usage 1
 	    echo "Shorewall-$version Connections at $HOSTNAME - $(date)"
 	    echo
-	    cat /proc/net/ip_conntrack
+	    cat /pro/net/ip_conntrack
 	    ;;
 	nat)
 	    [ $# -gt 2 ] && usage 1
@@ -960,6 +964,18 @@ case "$1" in
 	    brctl show
 	fi
 
+	echo
+	echo "/proc"
+	echo
+
+	show_proc /proc/sys/net/ipv4/ip_forward
+
+	for directory in /proc/sys/net/ipv4/conf/*; do
+	    for file in proxy_arp arp_filter rp_filter; do
+		show_proc $directory/$file
+	    done
+	done
+
 	echo
 	echo "Routing Rules"
 	echo