From 0f242d1a1fa363b19229b886622ef9ca3a4f50b5 Mon Sep 17 00:00:00 2001
From: Gaurav <gaurav.sinha@vyatta.com>
Date: Tue, 21 Feb 2012 13:46:20 -0800
Subject: modified to use AddressFilter from IpTables (cherry picked from
 commit 1392750b600cec991e24e7ab0cc211c621e4430a)

---
 Makefile.am                          |  1 -
 lib/Vyatta/Conntrack/RuleCT.pm       | 10 +++++-----
 scripts/vyatta-conntrack-timeouts.pl |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0080498..39a08b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,6 @@ checkparamsonreboot_SCRIPTS += scripts/check-params-on-reboot.d/conntrack-hash-s
 share_perl5_DATA = lib/Vyatta/Conntrack/Config.pm
 share_perl5_DATA  += lib/Vyatta/Conntrack/ConntrackUtil.pm
 share_perl5_DATA  += lib/Vyatta/Conntrack/RuleCT.pm
-share_perl5_DATA  += lib/Vyatta/Conntrack/AddressFilterCT.pm
 
 sbin_SCRIPTS = scripts/vyatta-update-conntrack-log.pl
 bin_sudo_usersdir = $(bindir)/sudo-users
diff --git a/lib/Vyatta/Conntrack/RuleCT.pm b/lib/Vyatta/Conntrack/RuleCT.pm
index 3a0377b..e407f42 100644
--- a/lib/Vyatta/Conntrack/RuleCT.pm
+++ b/lib/Vyatta/Conntrack/RuleCT.pm
@@ -2,10 +2,10 @@ package Vyatta::Conntrack::RuleCT;
 
 use strict;
 use Vyatta::Config;
-require Vyatta::Conntrack::AddressFilterCT;
+require Vyatta::IpTables::AddressFilter;
 
-my $src = new Vyatta::Conntrack::AddressFilterCT;
-my $dst = new Vyatta::Conntrack::AddressFilterCT;
+my $src = new Vyatta::IpTables::AddressFilter;
+my $dst = new Vyatta::IpTables::AddressFilter;
 
 my %fields = (
   _rule_number => undef,
@@ -52,8 +52,8 @@ sub setupDummy {
   my ($self, $level) = @_;
 
   %{$self} = %dummy_rule;
-  $src = new Vyatta::Conntrack::AddressFilterCT;
-  $dst = new Vyatta::Conntrack::AddressFilterCT;
+  $src = new Vyatta::IpTables::AddressFilter;
+  $dst = new Vyatta::IpTables::AddressFilter;
 
   # set the default policy
   my $config = new Vyatta::Config;
diff --git a/scripts/vyatta-conntrack-timeouts.pl b/scripts/vyatta-conntrack-timeouts.pl
index 8ab322d..7395b06 100644
--- a/scripts/vyatta-conntrack-timeouts.pl
+++ b/scripts/vyatta-conntrack-timeouts.pl
@@ -6,7 +6,7 @@ use strict;
 
 use Vyatta::Config;
 use Vyatta::Conntrack::RuleCT;
-use Vyatta::Conntrack::AddressFilterCT;
+use Vyatta::IpTables::AddressFilter;
 use Getopt::Long;
 use Vyatta::Zone;
 use Sys::Syslog qw(:standard :macros);
-- 
cgit v1.2.3