From 3ede79187fac8a03d060deb82ee389d08acef2e2 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 2 Sep 2004 17:12:39 +0000
Subject: [PATCH] Fix tcrules PROTO processing

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1593 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/changelog.txt    | 2 ++
 Shorewall2/firewall         | 2 ++
 Shorewall2/releasenotes.txt | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 0f0c2e3fd..296f08c9e 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -58,3 +58,5 @@ Changes since 2.0.3
 27) Include params file on 'restore'
 
 28) Apply Richard Musil's patch.
+
+29) Correct parsing of PROTO column in setup_tc1().
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 4d593fa4e..27191056f 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -2180,6 +2180,8 @@ process_tc_rule()
 	fi
 
 	[ "x$dest"   = "x-"  ] || r="${r}-d $dest "
+	[ "x$proto"  = "x-"  ] && proto=all
+	[ "x$proto"  = "x"   ] && proto=all
 	[ "$proto"   = "all" ] || r="${r}-p $proto "
 	[ "x$port"   = "x-"  ] || r="${r}--dport $port "
 	[ "x$sport"  = "x-"  ] || r="${r}--sport $sport "
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 44c82fb11..0de19c214 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -40,6 +40,8 @@ Problems corrected since 2.1.7
 
 1)  Fix parsing of ACTION with ":" but no log level (Richard Musil).
 
+2)  Fix parsing of PROTO column in /etc/shorewall/tcrules.
+
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.1: