From f136f6c26dbd7f14d770a81ecd01077ed0eda53e Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 18 Mar 2007 02:57:30 +0000
Subject: [PATCH] Update lib.cli to account for mindless renaming of
 /proc/net/ip_conntrack to /proc/net/nf_conntrack

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5565 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt    | 3 +++
 Shorewall/lib.cli          | 4 ++--
 Shorewall/releasenotes.txt | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index f0e7acac7..31a312de5 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -2,6 +2,9 @@ Changes in 3.4.2
 
 1)  Update modules file for 2.6.20 module madness.
 
+2)  Update /sbin/shorewall[-lite] to account for mindless renaming of
+    /proc/net/ip_conntrack to /proc/net/nf_conntrack.
+
 Changes in 3.4.1
 
 1)  Add rest of proxy arp fix.
diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli
index 306a84fd6..c8c3f7ae6 100644
--- a/Shorewall/lib.cli
+++ b/Shorewall/lib.cli
@@ -445,7 +445,7 @@ show_command() {
 	    [ $# -gt 1 ] && usage 1
 	    echo "$PRODUCT $version Connections at $HOSTNAME - $(date)"
 	    echo
-	    cat /proc/net/ip_conntrack
+	    [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
 	    ;;
 	nat)
 	    [ $# -gt 1 ] && usage 1
@@ -645,7 +645,7 @@ dump_command() {
     $IPTABLES -t mangle -L $IPT_OPTIONS
 
     heading "Conntrack Table"
-    cat /proc/net/ip_conntrack
+    [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
 
     heading "IP Configuration"
     ip addr ls
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index 1a24baf17..82692e6a6 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -33,6 +33,10 @@ Problems corrected in Shorewall 3.4.2
 1)  The /usr/share/shorewall[-lite]/modules file has been updated for
     kernel 2.6.20.
 
+2)  The /proc/net/ip_conntrack pseudo-file has been inexplicably
+    renamed /proc/net/nf_conntrack in kernel 2.6.20. The lib.cli
+    library has been updated to look for both files.
+
 Migration Considerations:
 
 If you are migrating from a Shorewall version earlier than 3.2.0 then