diff options
| author | Daniil Baturin <daniil.baturin@vyatta.com> | 2012-03-29 03:09:03 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil.baturin@vyatta.com> | 2012-03-29 03:09:03 +0700 |
| commit | d34ccd9bd463765cfabaca527471ceabb1e6ccb9 (patch) | |
| tree | 4e3eabf490ea7e2dfb1b73233d20b5a89c56f788 | |
| parent | 13ebee827ca66bccd727213d4c66c7b3372e3d9c (diff) | |
| download | vyatta-cfg-vpn-d34ccd9bd463765cfabaca527471ceabb1e6ccb9.tar.gz vyatta-cfg-vpn-d34ccd9bd463765cfabaca527471ceabb1e6ccb9.zip | |
Rename "local/remote subnet" to "local/remote prefix".
5 files changed, 8 insertions, 8 deletions
diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl index 5c05f44..5f27ae0 100755 --- a/scripts/vpn-config.pl +++ b/scripts/vpn-config.pl @@ -559,7 +559,7 @@ if ( $vcVPN->exists('ipsec') ) { # Write tunnel configuration # my $leftsubnet = $vcVPN->returnValue( - "ipsec site-to-site peer $peer tunnel $tunnel local subnet"); + "ipsec site-to-site peer $peer tunnel $tunnel local prefix"); if ( defined($leftsubnet) && $leftsubnet eq 'any' ) { $leftsubnet = '0.0.0.0/0'; } @@ -587,7 +587,7 @@ if ( $vcVPN->exists('ipsec') ) { } my $remotesubnet = $vcVPN->returnValue( - "ipsec site-to-site peer $peer tunnel $tunnel remote subnet"); + "ipsec site-to-site peer $peer tunnel $tunnel remote prefix"); my $rightsubnet; my $allow_nat_networks = $vcVPN->returnValue( @@ -633,7 +633,7 @@ if ( $vcVPN->exists('ipsec') ) { if ( defined($rightsubnet) ) { $genout .= "\trightsubnet=$rightsubnet\n"; - # not adding vpn route if remote subnet is 0.0.0.0/0 + # not adding vpn route if remote prefix is 0.0.0.0/0 # user should add a route [default/static] manually $leftsourceip = undef if $rightsubnet eq '0.0.0.0/0'; if ($rightsubnet =~ /vhost:%priv/) { @@ -711,7 +711,7 @@ if ( $vcVPN->exists('ipsec') ) { my $remotesubnet_object = new NetAddr::IP($rightsubnet); if ($remotesubnet_object == $localsubnet_object) { vpn_die(["vpn","ipsec","site-to-site","peer",$peer], - "$vpn_cfg_err local subnet and remote subnet cannot be the same.\n"); + "$vpn_cfg_err local prefix and remote prefix cannot be the same.\n"); } if ($remotesubnet_object->contains($localsubnet_object)) { $needs_passthrough = 'true'; diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/prefix/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/prefix/node.def new file mode 100644 index 0000000..5895186 --- /dev/null +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/prefix/node.def @@ -0,0 +1,2 @@ +help: Local IPv4 or IPv6 prefix +type: ipv4net, ipv6net diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/subnet/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/subnet/node.def deleted file mode 100644 index fbae2e8..0000000 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local/subnet/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Local subnet -type: ipv4net diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/prefix/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/prefix/node.def new file mode 100644 index 0000000..76f6f6c --- /dev/null +++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/prefix/node.def @@ -0,0 +1,2 @@ +help: Remote IPv4 or IPv6 prefix +type: ipv4net, ipv6net diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/subnet/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/subnet/node.def deleted file mode 100644 index e5383bf..0000000 --- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote/subnet/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Remote subnet -type: ipv4net |