Rename VyattaNatRule to Vyatta::NatRule

Rearrange perl modules

3 files changed, 4 insertions, 380 deletions

diff --git a/scripts/VyattaNatRule.pm b/scripts/VyattaNatRule.pm
deleted file mode 100644
index a648035..0000000
--- a/scripts/VyattaNatRule.pm
+++ /dev/null
@@ -1,376 +0,0 @@
-package VyattaNatRule;
-
-use strict;
-use lib "/opt/vyatta/share/perl5/";
-use VyattaConfig;
-use VyattaMisc;
-use VyattaTypeChecker;
-use VyattaIpTablesAddressFilter;
-
-my $src = new VyattaIpTablesAddressFilter;
-my $dst = new VyattaIpTablesAddressFilter;
-
-my %fields = (
-  _type	        => undef,
-  _orig_type    => undef,
-  _inbound_if   => undef,
-  _outbound_if  => undef,
-  _proto        => undef,
-  _exclude      => undef,
-  _inside_addr  => {
-                    _addr => undef,
-                    _range  => {
-                                _start => undef,
-                                _stop  => undef,
-                               },
-                    _port => undef,
-                   },
-  _outside_addr => {
-                    _addr   => undef,
-                    _range  => {
-                                _start => undef,
-                                _stop  => undef,
-                               },
-                    _port => undef,
-                   },
-);
-
-sub new {
-  my $that = shift;
-  my $class = ref ($that) || $that;
-  my $self = {
-    %fields,
-  };
-
-  bless $self, $class;
-  return $self;
-}
-
-sub setup {
-  my ( $self, $level ) = @_;
-  my $config = new VyattaConfig;
-
-  $config->setLevel("$level");
-
-  $self->{_type} = $config->returnValue("type");
-  $self->{_orig_type} = $config->returnOrigValue("type");
-  $self->{_inbound_if} = $config->returnValue("inbound-interface");
-  $self->{_outbound_if} = $config->returnValue("outbound-interface");
-  $self->{_proto} = $config->returnValue("protocol");
-  $self->{_exclude} = $config->exists("exclude");
-  
-  $self->{_inside_addr}->{_addr}
-    = $config->returnValue("inside-address address");
-  $self->{_inside_addr}->{_range}->{_start} = undef;
-  $self->{_inside_addr}->{_range}->{_stop} = undef;
-  if (defined($self->{_inside_addr}->{_addr})
-      && $self->{_inside_addr}->{_addr} =~ /^([^-]+)-([^-]+)$/) {
-    $self->{_inside_addr}->{_range}->{_start} = $1;
-    $self->{_inside_addr}->{_range}->{_stop} = $2;
-    $self->{_inside_addr}->{_addr} = undef;
-  }
-  $self->{_inside_addr}->{_port}
-    = $config->returnValue("inside-address port");
-  
-  $self->{_outside_addr}->{_addr}
-    = $config->returnValue("outside-address address");
-  $self->{_outside_addr}->{_range}->{_start} = undef;
-  $self->{_outside_addr}->{_range}->{_stop} = undef;
-  if (defined($self->{_outside_addr}->{_addr})
-      && $self->{_outside_addr}->{_addr} =~ /^([^-]+)-([^-]+)$/) {
-    $self->{_outside_addr}->{_range}->{_start} = $1;
-    $self->{_outside_addr}->{_range}->{_stop} = $2;
-    $self->{_outside_addr}->{_addr} = undef;
-  }
-  $self->{_outside_addr}->{_port}
-    = $config->returnValue("outside-address port");
-
-  $src->setup("$level source");
-  $dst->setup("$level destination");
-
-  return 0;
-}
-
-sub setupOrig {
-  my ( $self, $level ) = @_;
-  my $config = new VyattaConfig;
-
-  $config->setLevel("$level");
-
-  $self->{_type} = $config->returnOrigValue("type");
-  $self->{_orig_type} = $config->returnOrigValue("type");
-  $self->{_inbound_if} = $config->returnOrigValue("inbound-interface");
-  $self->{_outbound_if} = $config->returnOrigValue("outbound-interface");
-  $self->{_proto} = $config->returnOrigValue("protocol");
-  $self->{_exclude} = $config->existsOrig("exclude");
-  
-  $self->{_inside_addr}->{_addr}
-    = $config->returnOrigValue("inside-address address");
-  $self->{_inside_addr}->{_range}->{_start} = undef;
-  $self->{_inside_addr}->{_range}->{_stop} = undef;
-  if (defined($self->{_inside_addr}->{_addr})
-      && $self->{_inside_addr}->{_addr} =~ /^([^-]+)-([^-]+)$/) {
-    $self->{_inside_addr}->{_range}->{_start} = $1;
-    $self->{_inside_addr}->{_range}->{_stop} = $2;
-    $self->{_inside_addr}->{_addr} = undef;
-  }
-  $self->{_inside_addr}->{_port}
-    = $config->returnOrigValue("inside-address port");
-  
-  $self->{_outside_addr}->{_addr}
-    = $config->returnOrigValue("outside-address address");
-  $self->{_outside_addr}->{_range}->{_start} = undef;
-  $self->{_outside_addr}->{_range}->{_stop} = undef;
-  if (defined($self->{_outside_addr}->{_addr})
-      && $self->{_outside_addr}->{_addr} =~ /^([^-]+)-([^-]+)$/) {
-    $self->{_outside_addr}->{_range}->{_start} = $1;
-    $self->{_outside_addr}->{_range}->{_stop} = $2;
-    $self->{_outside_addr}->{_addr} = undef;
-  }
-  $self->{_outside_addr}->{_port}
-    = $config->returnOrigValue("outside-address port");
-
-  $src->setupOrig("$level source");
-  $dst->setupOrig("$level destination");
-
-  return 0;
-}
-
-# returns (rule, error)
-sub rule_str {
-  my ($self) = @_;
-  my $rule_str = "";
-  my $can_use_port = 1;
-
-  if (!defined($self->{_proto}) ||
-      (($self->{_proto} ne "tcp") && ($self->{_proto} ne "6")
-       && ($self->{_proto} ne "udp") && ($self->{_proto} ne "17"))) {
-    $can_use_port = 0;
-  }
-  if (($self->{_type} eq "source") || ($self->{_type} eq "masquerade")) {
-    return (undef, 'cannot specify inbound interface with '
-                   . '"masquerade" or "source" rules')
-      if (defined($self->{_inbound_if}));
-
-    if ($self->{_exclude}) {
-      $rule_str .= "-j RETURN";
-    } elsif ($self->{_type} eq "masquerade") {
-      $rule_str .= "-j MASQUERADE";
-    } else {
-      $rule_str .= "-j SNAT";
-    }
-    if (defined($self->{_outbound_if})) {
-      $rule_str .= " -o $self->{_outbound_if}";
-    } else {
-      # "masquerade" requires outbound_if.
-      # also make this a requirement for "source" to prevent users from
-      # inadvertently NATing loopback traffic.
-      return (undef, "outbound-interface not specified");
-    }
-
-    if (defined($self->{_proto})) {
-      my $str = $self->{_proto};
-      $str =~ s/^\!(.*)$/! $1/;
-      $rule_str .= " -p $str";
-    }
-
-    my $to_src = '';
-    if (defined($self->{_outside_addr}->{_addr})) {
-      my $addr = $self->{_outside_addr}->{_addr};
-      return (undef, "\"$addr\" is not a valid IP address")
-        if (!VyattaTypeChecker::validateType('ipv4', $addr, 1));
-      $to_src .= $addr;
-    } elsif (defined($self->{_outside_addr}->{_range}->{_start})
-             && defined($self->{_outside_addr}->{_range}->{_stop})) {
-      my $start = $self->{_outside_addr}->{_range}->{_start};
-      my $stop = $self->{_outside_addr}->{_range}->{_stop};
-      return (undef, "\"$start-$stop\" is not a valid IP range")
-        if (!VyattaTypeChecker::validateType('ipv4', $start, 1)
-            || !VyattaTypeChecker::validateType('ipv4', $stop, 1));
-      $to_src .= "$start-$stop";
-    }
-   
-    if (($to_src ne "") && ($self->{_type} eq "masquerade")) {
-      return (undef, "cannot specify outside IP address with \"masquerade\"");
-    }
-
-    if (defined($self->{_outside_addr}->{_port})) {
-      if (!$can_use_port) {
-        return (undef, "ports can only be specified when protocol is \"tcp\" "
-                       . "or \"udp\" (currently \"$self->{_proto}\")");
-      }
-      if ($self->{_type} ne "masquerade") {
-        $to_src .= ":";
-      }
-      my ($success, $err) = (undef, undef);
-      if ($self->{_outside_addr}->{_port} =~ /-/) {
-        ($success, $err)
-          = VyattaMisc::isValidPortRange($self->{_outside_addr}->{_port}, '-');
-        return (undef, $err) if (!defined($success));
-      } else {
-        ($success, $err)
-          = VyattaMisc::isValidPortNumber($self->{_outside_addr}->{_port});
-        return (undef, $err) if (!defined($success));
-      }
-      $to_src .= "$self->{_outside_addr}->{_port}";
-    }
-    
-    if ($self->{_exclude}) {
-      # outside-address has no effect for "exclude" rules
-    } elsif ($to_src ne '') {
-      if ($self->{_type} eq "masquerade") {
-        $rule_str .= " --to-ports $to_src";
-      } else {
-        $rule_str .= " --to-source $to_src";
-      }
-    } elsif ($self->{_type} ne "masquerade") {
-      return (undef, "outside-address not specified");
-    }
-  } elsif ($self->{_type} eq "destination") {
-    # type is destination
-    return (undef,
-            'cannot specify outbound interface with "destination" rules')
-      if (defined($self->{_outbound_if}));
-
-    if ($self->{_exclude}) {
-      $rule_str .= "-j RETURN";
-    } else {
-      $rule_str .= "-j DNAT";
-    }
-  
-    if (defined($self->{_inbound_if})) {
-      $rule_str .= " -i $self->{_inbound_if}";
-    } else {
-      # make this a requirement to prevent users from
-      # inadvertently NATing loopback traffic.
-      return (undef, "inbound-interface not specified");
-    }
-  
-    if (defined($self->{_proto})) {
-      $rule_str .= " -p $self->{_proto}";
-    }
-
-    my $to_dst = " --to-destination ";
-    if (defined($self->{_inside_addr}->{_addr})) {
-      my $addr = $self->{_inside_addr}->{_addr};
-      return (undef, "\"$addr\" is not a valid IP address")
-        if (!VyattaTypeChecker::validateType('ipv4', $addr, 1));
-      $to_dst .= $addr;
-    } elsif (defined($self->{_inside_addr}->{_range}->{_start})
-             && defined($self->{_inside_addr}->{_range}->{_stop})) {
-      my $start = $self->{_inside_addr}->{_range}->{_start};
-      my $stop = $self->{_inside_addr}->{_range}->{_stop};
-      return (undef, "\"$start-$stop\" is not a valid IP range")
-        if (!VyattaTypeChecker::validateType('ipv4', $start, 1)
-            || !VyattaTypeChecker::validateType('ipv4', $stop, 1));
-      $to_dst .= "$start-$stop";
-    } 
-    
-    if (defined($self->{_inside_addr}->{_port})) {
-      if (!$can_use_port) {
-        return (undef, "ports can only be specified when protocol is \"tcp\" "
-                       . "or \"udp\" (currently \"$self->{_proto}\")");
-      }
-      my ($success, $err) = (undef, undef);
-      if ($self->{_inside_addr}->{_port} =~ /-/) {
-        ($success, $err)
-          = VyattaMisc::isValidPortRange($self->{_inside_addr}->{_port}, '-');
-        return (undef, $err) if (!defined($success));
-      } else {
-        ($success, $err)
-          = VyattaMisc::isValidPortNumber($self->{_inside_addr}->{_port});
-        return (undef, $err) if (!defined($success));
-      }
-      $to_dst .= ":$self->{_inside_addr}->{_port}";
-    }
-    
-    if ($self->{_exclude}) {
-      # inside-address has no effect for "exclude" rules
-    } elsif ($to_dst ne ' --to-destination ') {
-      $rule_str .= $to_dst;
-    } else {
-      return (undef, "inside-address not specified");
-    }
-  } else {
-    return (undef, "rule type not specified/valid");
-  }
-
-  # source rule string
-  my ($src_str, $src_err) = $src->rule();
-  return (undef, $src_err) if (!defined($src_str));
-  
-  # destination rule string
-  my ($dst_str, $dst_err) = $dst->rule();
-  return (undef, $dst_err) if (!defined($dst_str));
-
-  if ((grep /multiport/, $src_str) || (grep /multiport/, $dst_str)) {
-    if ((grep /sport/, $src_str) && (grep /dport/, $dst_str)) {
-      return (undef, 'cannot specify multiple ports when both '
-                     . 'source and destination ports are specified');
-    }
-  }
-  $rule_str .= " $src_str $dst_str";
-
-  return ($rule_str, undef);
-}
-
-sub orig_type {
-  my ($self) = @_;
-  return "source" if ($self->{_orig_type} eq "masquerade");
-  return $self->{_orig_type};
-}
-
-sub new_type {
-  my ($self) = @_;
-  return "source" if ($self->{_type} eq "masquerade");
-  return $self->{_type};
-}
-
-sub print_str {
-  my ($self) = @_;
-  my $str =
-  "type[$self->{_type}] " .
-  "in_if[$self->{_inbound_if}] out_if[$self->{_outbound_if}] " .
-  "proto[$self->{_proto}] " .
-  "inaddr[$self->{_inside_addr}->{_addr}] " .
-  "inrange[$self->{_inside_addr}->{_range}->{_start}-" .
-  "$self->{_inside_addr}->{_range}->{_stop}] " .
-  "inp[$self->{_inside_addr}->{_port}] " .
-  "outaddr[$self->{_outside_addr}->{_addr}] " .
-  "outrange[$self->{_outside_addr}->{_range}->{_start}-" .
-  "$self->{_outside_addr}->{_range}->{_stop}]" .
-  "outp[$self->{_outside_addr}->{_port}] ";
-  
-  return $str;
-}
-
-sub outputXmlElem {
-  my ($name, $value, $fh) = @_;
-  print $fh "    <$name>$value</$name>\n";
-}
-
-sub outputXml {
-  my ($self, $fh) = @_;
-  outputXmlElem("type", $self->{_type}, $fh);
-  outputXmlElem("in_interface", $self->{_inbound_if}, $fh);
-  outputXmlElem("out_interface", $self->{_outbound_if}, $fh);
-  outputXmlElem("in_addr", $self->{_inside_addr}->{_addr}, $fh);
-  outputXmlElem("in_addr_start", $self->{_inside_addr}->{_range}->{_start},
-                $fh);
-  outputXmlElem("in_addr_stop", $self->{_inside_addr}->{_range}->{_stop},
-                $fh);
-  outputXmlElem("in_port", $self->{_inside_addr}->{_port}, $fh);
-  outputXmlElem("out_addr", $self->{_outside_addr}->{_addr}, $fh);
-  outputXmlElem("out_addr_start", $self->{_outside_addr}->{_range}->{_start},
-                $fh);
-  outputXmlElem("out_addr_stop", $self->{_outside_addr}->{_range}->{_stop},
-                $fh);
-  outputXmlElem("out_port", $self->{_outside_addr}->{_port}, $fh);
- 
-  $src->outputXml("src", $fh);
-  $dst->outputXml("dst", $fh);
-  # no proto? ($self->{_proto})
-}
-
-1;
-
diff --git a/scripts/vyatta-show-nat.pl b/scripts/vyatta-show-nat.pl
index 2d3c773..8abce6d 100755
--- a/scripts/vyatta-show-nat.pl
+++ b/scripts/vyatta-show-nat.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
 
 use strict;
-use lib "/opt/vyatta/share/perl5/";
+use lib "/opt/vyatta/share/perl5";
 use VyattaConfig;
-use VyattaNatRule;
+use Vyatta::NatRule;
 
 sub numerically { $a <=> $b; }
 
diff --git a/scripts/vyatta-update-nat.pl b/scripts/vyatta-update-nat.pl
index a8d4cd3..9842309 100755
--- a/scripts/vyatta-update-nat.pl
+++ b/scripts/vyatta-update-nat.pl
@@ -1,9 +1,9 @@
-#!/usr/bin/perl
+ #!/usr/bin/perl
 
 use strict;
 use lib "/opt/vyatta/share/perl5/";
 use VyattaConfig;
-use VyattaNatRule;
+use Vyatta::NatRule;
 
 sub numerically { $a <=> $b; }