From 223ed5b3a3a61f630b674c39947ac3509f7978ac Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Thu, 2 Aug 2012 13:25:44 -0700
Subject: [PATCH] More additions to the helper table and to the conntrack
 files.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Chains.pm | 3 ++-
 Shorewall/Perl/Shorewall/Raw.pm    | 2 +-
 Shorewall/configfiles/conntrack    | 1 +
 Shorewall6/configfiles/conntrack   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Shorewall/Perl/Shorewall/Chains.pm b/Shorewall/Perl/Shorewall/Chains.pm
index ae613528d..67eb43c73 100644
--- a/Shorewall/Perl/Shorewall/Chains.pm
+++ b/Shorewall/Perl/Shorewall/Chains.pm
@@ -28,7 +28,7 @@ package Shorewall::Chains;
 require Exporter;
 
 use Scalar::Util 'reftype';
-use Digest::SHA qw(sha1);
+use Digest::SHA1 qw(sha1);
 use File::Basename;
 use Shorewall::Config qw(:DEFAULT :internal);
 use Shorewall::Zones;
@@ -659,6 +659,7 @@ sub initialize( $$$ ) {
 		 irc             => TCP,
 		 'netbios-ns'    => UDP,
 		 pptp            => TCP,
+		 'Q.931'         => TCP,
 		 RAS             => UDP,
 		 sane            => TCP,
 		 sip             => UDP,
diff --git a/Shorewall/Perl/Shorewall/Raw.pm b/Shorewall/Perl/Shorewall/Raw.pm
index 8adaf352c..d468dd031 100644
--- a/Shorewall/Perl/Shorewall/Raw.pm
+++ b/Shorewall/Perl/Shorewall/Raw.pm
@@ -77,7 +77,7 @@ sub process_notrack_rule( $$$$$$$ ) {
 	    if ( $option eq 'helper' ) {
 		my $modifiers = '';
 
-		if ( $args =~ /^([-\w]+)\((.+)\)$/ ) {
+		if ( $args =~ /^([-\w.]+)\((.+)\)$/ ) {
 		    $args      = $1;
 		    $modifiers = $2;
 		}
diff --git a/Shorewall/configfiles/conntrack b/Shorewall/configfiles/conntrack
index ad8e30e12..5e4733b5b 100644
--- a/Shorewall/configfiles/conntrack
+++ b/Shorewall/configfiles/conntrack
@@ -13,6 +13,7 @@ CT:helper:ftp		all		-		tcp	21
 CT:helper:amanda	all		-		udp	10080
 COMMENT AUTOHELPERS - H323
 CT:helper:RAS		all		-		udp	1719
+CT:helper:Q.931		all		-		tcp	1720
 COMMENT AUTOHELPERS
 CT:helper:sip		all		-		udp	5060
 CT:helper:tftp		all		-		udp	69
diff --git a/Shorewall6/configfiles/conntrack b/Shorewall6/configfiles/conntrack
index 99812b2d0..cca4209ab 100644
--- a/Shorewall6/configfiles/conntrack
+++ b/Shorewall6/configfiles/conntrack
@@ -13,6 +13,7 @@ CT:helper:ftp		all		-		tcp	21
 CT:helper:amanda	all		-		udp	10080
 COMMENT AUTOHELPERS - H323
 CT:helper:RAS		all		-		udp	1719
+CT:helper:Q.931		all		-		tcp	1720
 COMMENT AUTOHELPERS
 CT:helper:sip		all		-		udp	5060
 CT:helper:tftp		all		-		udp	69