Remove IPS from zone

1 files changed, 1 insertions, 36 deletions

diff --git a/lib/Vyatta/Zone.pm b/lib/Vyatta/Zone.pm
index 763be7a..9ba19f6 100755
--- a/lib/Vyatta/Zone.pm
+++ b/lib/Vyatta/Zone.pm
@@ -50,7 +50,6 @@ our @EXPORT_OK = qw(%cmd_hash %table_hash %policy_hash);
 
 my %get_zone_chain_hash = (
     get_zone_chain     => \&get_zone_chain,
-    get_ips_zone_chain => \&get_ips_zone_chain,
 );
 
 my $debug="false";
@@ -58,8 +57,7 @@ my $syslog="false";
 my $logger = 'sudo logger -t zone.pm -p local0.warn --';
 
 my %script_to_feature_hash = (
-        'vyatta-zone.pl'        => 'ZONE-FW',
-        'vyatta-zone-ips.pl'    => 'ZONE-IPS');
+        'vyatta-zone.pl'        => 'ZONE-FW');
 
 sub run_cmd {
     my $cmd = shift;
@@ -121,25 +119,12 @@ sub is_local_zone {
     return $config->$value_func("zone-policy zone $zone_name local-zone");
 }
 
-sub is_ips_enabled {
-    my ($value_func, $zone_name, $from_zone, $ips_type) = @_;
-    $ips_type =~ s/name/enable/;
-    my $config = new Vyatta::Config;
-    return $config->$value_func("zone-policy zone $zone_name from $from_zone
-	content-inspection $ips_type")
-}
-
 sub get_zone_default_policy {
     my ($value_func, $zone_name) = @_;
     my $config = new Vyatta::Config;
     return $config->$value_func("zone-policy zone $zone_name default-action");
 }
 
-sub get_ips_zone_default_policy {
-    my ($value_func, $zone_name) = @_;
-    return 'accept';
-}
-
 sub rule_exists {
     my ($command, $table, $chain_name, $target, $interface) = @_;
     my $cmd =
@@ -159,12 +144,6 @@ sub get_zone_chain {
     return get_zone_chain_name($value_func, $zone, $localout, $chain_prefix);
 }
 
-sub get_ips_zone_chain {
-    my ($value_func, $zone, $localout) = @_;
-    my $chain_prefix = "VZIPS_$zone"; # should be same length as zone_chain
-    return get_zone_chain_name($value_func, $zone, $localout, $chain_prefix);
-}
-
 sub get_zone_chain_name {
     my ($value_func, $zone, $localout, $chain_prefix) = @_;
     my $chain = $chain_prefix;
@@ -248,18 +227,6 @@ sub validity_checks {
                         "configured, cannot be defined under a zone";
               return($returnstring, );
             }
-            # make sure content-inspection is not applied to this interface
-            if ($config->exists("content-inspection in enable") ||
-                $config->exists("content-inspection out enable") ||
-                $config->exists("content-inspection local enable") ||
-                $config->exists("content-inspection in ipv6-enable") ||
-                $config->exists("content-inspection out ipv6-enable") ||
-                $config->exists("content-inspection local ipv6-enable")) {
-              $returnstring =
-                        "interface $interface has content-inspection " .
-                        "configured, cannot be defined under a zone";
-              return($returnstring, );
-            }
           }
           # make sure an interface is not defined under two zones
           if (scalar(grep(/^$interface$/, @all_interfaces)) > 0) {
@@ -509,8 +476,6 @@ sub get_zone_hash {
         get_firewall_ruleset("returnOrigValue", $zone, $from_zone, "name");
       $zone_hash->{$zone}{'from'}->{$from_zone}{'firewall'}->{'ipv6'} =
         get_firewall_ruleset("returnOrigValue", $zone, $from_zone, "ipv6-name");
-      $zone_hash->{$zone}{'from'}->{$from_zone}{'content-inspection'} =
-        is_ips_enabled("returnOrigValue", $zone, $from_zone, "enable");
     }
     if (is_local_zone("existsOrig", $zone)){
       $zone_hash->{$zone}{'interfaces'} = ['local-zone'];