From 4ff3572d86d43dc5fd005294ff03a5e558384350 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 15 Jul 2008 16:17:58 +0000
Subject: [PATCH] Only list interfaces with an IPv4 configuration in 'show ip'
 and 'dump'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8636 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-common/lib.cli       | 4 ++--
 Shorewall-perl/Shorewall/Tc.pm | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Shorewall-common/lib.cli b/Shorewall-common/lib.cli
index 930a80242..d7cbc4efd 100644
--- a/Shorewall-common/lib.cli
+++ b/Shorewall-common/lib.cli
@@ -536,7 +536,7 @@ show_command() {
 	    [ $# -gt 1 ] && usage 1
 	    echo "$PRODUCT $version IP at $HOSTNAME - $(date)"
 	    echo
-	    ip addr list
+	    ip -4 addr list
 	    ;;
 	routing)
 	    [ $# -gt 1 ] && usage 1
@@ -717,7 +717,7 @@ dump_command() {
     [ -f /proc/net/ip_conntrack ] && cat /proc/net/ip_conntrack || cat /proc/net/nf_conntrack
 
     heading "IP Configuration"
-    ip addr list
+    ip -4 addr list
 
     heading "IP Stats"
     ip -stat link list
diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm
index 869f53b12..944048d5f 100644
--- a/Shorewall-perl/Shorewall/Tc.pm
+++ b/Shorewall-perl/Shorewall/Tc.pm
@@ -388,7 +388,6 @@ sub validate_tc_device( $$$$$ ) {
 			    classify      => $classify , 
 			    tablenumber   => 1 ,
 			    redirected    => \@redirected ,
-			    protocols     => [] ,
 			  } ,
 
     push @tcdevices, $device;