From 97a29c7db8d21ea5f3bc8882b5b6e86405e5aed1 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil.baturin@vyatta.com>
Date: Thu, 24 Nov 2011 07:40:34 +0700
Subject: Update rule handling modules to correspond "outside/inside-address ->
 translation" change

---
 lib/Vyatta/DstNatRule.pm | 8 ++++----
 lib/Vyatta/SrcNatRule.pm | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/Vyatta/DstNatRule.pm b/lib/Vyatta/DstNatRule.pm
index 5e0f5d9..c0b9b01 100644
--- a/lib/Vyatta/DstNatRule.pm
+++ b/lib/Vyatta/DstNatRule.pm
@@ -80,7 +80,7 @@ sub setup {
   $self->{_log} = $config->returnValue("log");
 
   $self->{_inside_addr}->{_addr}
-    = $config->returnValue("inside-address address");
+    = $config->returnValue("translation address");
   $self->{_inside_addr}->{_range}->{_start} = undef;
   $self->{_inside_addr}->{_range}->{_stop} = undef;
   if (defined($self->{_inside_addr}->{_addr})
@@ -90,7 +90,7 @@ sub setup {
     $self->{_inside_addr}->{_addr} = undef;
   }
   $self->{_inside_addr}->{_port}
-    = $config->returnValue("inside-address port");
+    = $config->returnValue("translation port");
   $src->setup("$level source");
   $dst->setup("$level destination");
 
@@ -111,7 +111,7 @@ sub setupOrig {
   $self->{_log} = $config->returnOrigValue("log");
 
   $self->{_inside_addr}->{_addr}
-    = $config->returnOrigValue("inside-address address");
+    = $config->returnOrigValue("translation address");
   $self->{_inside_addr}->{_range}->{_start} = undef;
   $self->{_inside_addr}->{_range}->{_stop} = undef;
   if (defined($self->{_inside_addr}->{_addr})
@@ -121,7 +121,7 @@ sub setupOrig {
     $self->{_inside_addr}->{_addr} = undef;
   }
   $self->{_inside_addr}->{_port}
-    = $config->returnOrigValue("inside-address port");
+    = $config->returnOrigValue("translation port");
     
   $src->setupOrig("$level source");
   $dst->setupOrig("$level destination");
diff --git a/lib/Vyatta/SrcNatRule.pm b/lib/Vyatta/SrcNatRule.pm
index 0efbe8f..8579eba 100644
--- a/lib/Vyatta/SrcNatRule.pm
+++ b/lib/Vyatta/SrcNatRule.pm
@@ -79,7 +79,7 @@ sub setup {
   $self->{_log} = $config->returnValue("log");
   
   $self->{_outside_addr}->{_addr}
-    = $config->returnValue("outside-address address");
+    = $config->returnValue("translation address");
   if (defined($self->{_outside_addr}->{_addr}) && ($self->{_outside_addr}->{_addr} eq "masquerade")) {
     $self->{_is_masq} = 1;
   }
@@ -92,7 +92,7 @@ sub setup {
     $self->{_outside_addr}->{_addr} = undef;
   }
   $self->{_outside_addr}->{_port}
-    = $config->returnValue("outside-address port");
+    = $config->returnValue("translation port");
 
   $src->setup("$level source");
   $dst->setup("$level destination");
@@ -267,7 +267,7 @@ sub rule_str {
         }
       }
     } elsif (!defined($self->{_is_masq})) {
-      return ('outside-address not specified', undef);
+      return ('translation address not specified', undef);
     }
 
 
-- 
cgit v1.2.3