From c13dc26e4149d87f92728fb546f67ecac22ea9fc Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 15 Jan 2008 01:19:00 +0000 Subject: [PATCH] * Use correct package name * Include filter rules --- etc/inc/filter.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index e40e771b6f..eaec1dba52 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -1352,9 +1352,9 @@ EOD; $natrules .= frickin_generate_rules('nat'); } - if (is_package_installed('sipproxd') && file_exists('/usr/local/pkg/sipproxd.inc')) { + if (is_package_installed('siproxd') && file_exists('/usr/local/pkg/sipproxd.inc')) { require_once('sipproxd.inc'); - $natrules .= squid_generate_rules('nat'); + $natrules .= siproxd_generate_rules('nat'); } $natrules .= process_carp_nat_rules(); @@ -2247,6 +2247,11 @@ function filter_rules_generate() { require_once ('frickin.inc'); $ipfrules .= frickin_generate_rules('filter'); } + + if (is_package_installed('siproxd') && file_exists('/usr/local/pkg/sipproxd.inc')) { + require_once('sipproxd.inc'); + $ipfrules .= siproxd_generate_rules('filter'); + } /* if captive portal is enabled, ensure that access to this port * is allowed on a locked down interface