summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil.baturin@vyatta.com>2011-11-24 07:40:34 +0700
committerDaniil Baturin <daniil.baturin@vyatta.com>2011-11-24 07:40:34 +0700
commit97a29c7db8d21ea5f3bc8882b5b6e86405e5aed1 (patch)
treea2b3de42a353ccf0cb2c24b21847943765b53308
parentf2a67a32a6e10dc0dea8f092466f08584e24610b (diff)
downloadvyatta-nat-97a29c7db8d21ea5f3bc8882b5b6e86405e5aed1.tar.gz
vyatta-nat-97a29c7db8d21ea5f3bc8882b5b6e86405e5aed1.zip
Update rule handling modules to correspond "outside/inside-address -> translation" change
-rw-r--r--lib/Vyatta/DstNatRule.pm8
-rw-r--r--lib/Vyatta/SrcNatRule.pm6
2 files changed, 7 insertions, 7 deletions
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);
}