From fa500b9ea2224f508148f9e057e46a13304889b2 Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Tue, 8 Oct 2013 09:20:46 -0700
Subject: [PATCH] Correct H323 and netbios-ns handling.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall/Perl/Shorewall/Config.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm
index 76206ab9d..629711c20 100644
--- a/Shorewall/Perl/Shorewall/Config.pm
+++ b/Shorewall/Perl/Shorewall/Config.pm
@@ -4014,7 +4014,14 @@ sub Helper_Match() {
 sub have_helper( $$$ ) {
     my ( $helper, $proto, $port ) = @_;
 
-    if ( $helpers_enabled{$helper} ) {
+    my $helper_base = $helper;
+
+    $helper_base =~ s/-\d$//;
+    $helper_base =  $helpers_map{$helper_base};
+    $helper_base =~ s/_HELPER//;
+    $helper_base =~ s/_/-/;
+
+    if ( $helpers_enabled{lc $helper_base} ) {
 	if ( have_capability 'CT_TARGET' ) {
 	    qt1( "$iptables $iptablesw -t raw -A $sillyname -p $proto --dport $port -j CT --helper $helper" );
 	} else {