Merge branch 'current' of https://github.com/mevertse/vyatta-nat into HEAD

10 files changed, 28 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index d7efc86..e2f0a55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vyatta-nat (0.13.0+vyos2+current1) unstable; urgency=medium
+
+  [ Thomas Jepp ]
+  * Fix build depends.
+
+  [ Kim Hagen ]
+
+ -- Kim Hagen <kim.sidney@gmail.com>  Sun, 24 Jan 2016 15:17:48 -0500
+
 vyatta-nat (0.13.0+vyos2+lithium7) unstable; urgency=low
 
   [ Alex Harpin ]
diff --git a/debian/control b/debian/control
index 46086c9..304692e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vyatta-nat
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 5), autotools-dev, automake, autoconf, cpio
 Standards-Version: 3.7.2
 
 Package: vyatta-nat
diff --git a/lib/VyOS/Nptv6Rule.pm b/lib/VyOS/Nptv6Rule.pm
index f9e7632..d753e93 100644
--- a/lib/VyOS/Nptv6Rule.pm
+++ b/lib/VyOS/Nptv6Rule.pm
@@ -58,10 +58,9 @@ sub setup {
   $config->setLevel("$level");
 
   $self->{_rule_number} = $config->returnParent("..");
-  $self->{_inside_if} = $config->returnValue("inside-interface");
-  $self->{_outside_if} = $config->returnValue("outside-interface");
-  $self->{_inside_pfx} = $config->returnValue("inside-prefix");
-  $self->{_outside_pfx} = $config->returnValue("outside-prefix");
+  $self->{_outside_if} = $config->returnValue("outbound-interface");
+  $self->{_inside_pfx} = $config->returnValue("source prefix");
+  $self->{_outside_pfx} = $config->returnValue("translation prefix");
 
   $self->{_disable} = $config->exists("disable");
 
diff --git a/lib/Vyatta/DstNatRule.pm b/lib/Vyatta/DstNatRule.pm
index e2aa483..bd54306 100644
--- a/lib/Vyatta/DstNatRule.pm
+++ b/lib/Vyatta/DstNatRule.pm
@@ -158,8 +158,10 @@ sub rule_str {
   if (defined($self->{_proto})) {
     my $str = $self->{_proto};
     my $negate ="";
-    $negate = "!" if (m/^\!(.*)$/);
-    $str =~ s/^\!(.*)$/ $1/;
+    if ($str =~ /^\!(.*)$/) {
+      $str    = $1;
+      $negate = "!";
+    }
     if ($str eq 'tcp_udp') {
       $tcp_and_udp = 1;
       $rule_str .= " -p tcp "; # we'll add the '-p udp' to 2nd rule later
diff --git a/lib/Vyatta/SrcNatRule.pm b/lib/Vyatta/SrcNatRule.pm
index 89623a4..52227a5 100644
--- a/lib/Vyatta/SrcNatRule.pm
+++ b/lib/Vyatta/SrcNatRule.pm
@@ -176,9 +176,11 @@ sub rule_str {
 
     if (defined($self->{_proto})) {
       my $str = $self->{_proto};
-      my $negate ="";
-      $negate = "!" if (m/^\!(.*)$/);
-      $str =~ s/^\!(.*)$/ $1/;
+      my $negate = "";
+      if ($str =~ /^\!(.*)$/) {
+        $str    = $1;
+        $negate = "!";
+      }
       if ($str eq 'tcp_udp') {
         $tcp_and_udp = 1;
         $rule_str .= " -p tcp "; # we'll add the '-p udp' to 2nd rule later
diff --git a/templates-cfg/nat/nptv6/rule/node.tag/outside-interface/node.def b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def
index d0954ad..f7bf286 100644
--- a/templates-cfg/nat/nptv6/rule/node.tag/outside-interface/node.def
+++ b/templates-cfg/nat/nptv6/rule/node.tag/outbound-interface/node.def
@@ -1,6 +1,6 @@
 type:  txt
 
-help: Outside interface of NPTv6 traffic
+help: Outbound interface of NPTv6 traffic
 
 enumeration: existing-interfaces; echo "any"
 
@@ -20,7 +20,7 @@ commit:expression: exec "
              fi
              let i++
         done
-        intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+\"
+        intf_group_name_array=\"eth+ bond+ br+ peth+ vtun+ tun+ wlm+ wlan+ vxlan+ vti+ l2tpeth+\"
         i=0
         for i in $intf_group_name_array; do
           if [ \"$i\" == \"$VAR(@)\" ]; then
diff --git a/templates-cfg/nat/nptv6/rule/node.tag/source/node.def b/templates-cfg/nat/nptv6/rule/node.tag/source/node.def
new file mode 100644
index 0000000..5be9e47
--- /dev/null
+++ b/templates-cfg/nat/nptv6/rule/node.tag/source/node.def
@@ -0,0 +1 @@
+help: IPv6 source prefix options
diff --git a/templates-cfg/nat/nptv6/rule/node.tag/inside-prefix/node.def b/templates-cfg/nat/nptv6/rule/node.tag/source/prefix/node.def
index 7af7091..47df40d 100644
--- a/templates-cfg/nat/nptv6/rule/node.tag/inside-prefix/node.def
+++ b/templates-cfg/nat/nptv6/rule/node.tag/source/prefix/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Inside prefix to be translated 
+help: IPv6 prefix to be translated 
 
 val_help: ipv6net; IPv6 prefix to match
 
diff --git a/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def b/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def
new file mode 100644
index 0000000..741f9ab
--- /dev/null
+++ b/templates-cfg/nat/nptv6/rule/node.tag/translation/node.def
@@ -0,0 +1 @@
+help: Translated IPv6 prefix options
diff --git a/templates-cfg/nat/nptv6/rule/node.tag/outside-prefix/node.def b/templates-cfg/nat/nptv6/rule/node.tag/translation/prefix/node.def
index 7af7091..d9c7d5a 100644
--- a/templates-cfg/nat/nptv6/rule/node.tag/outside-prefix/node.def
+++ b/templates-cfg/nat/nptv6/rule/node.tag/translation/prefix/node.def
@@ -1,6 +1,6 @@
 type: txt
 
-help: Inside prefix to be translated 
+help: Translated IPv6 prefix
 
 val_help: ipv6net; IPv6 prefix to match