Page Menu
Home
VyOS Platform
Search
Configure Global Search
Log In
Files
F2336
vpn.diff
All Users
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
246tnt
Aug 31 2016, 8:57 PM
2016-08-31 20:57:17 (UTC+0)
Size
1 KB
Referenced Files
None
Subscribers
None
vpn.diff
View Options
diff --git a/lib/Vyatta/VPN/vtiIntf.pm b/lib/Vyatta/VPN/vtiIntf.pm
index daec058..4e52fff 100755
--- a/lib/Vyatta/VPN/vtiIntf.pm
+++ b/lib/Vyatta/VPN/vtiIntf.pm
@@ -70,7 +70,7 @@ sub parseVtiTun {
if ($tunop =~ m/local ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/) {
$local = $1;
}
- if ($tunop =~ m/okey ([0-9\.]+)/) {
+ if ($tunop =~ m/key ([0-9\.]+)/) {
$mark = $1;
}
return($remote, $local, $tunName, $mark);
diff --git a/scripts/vyatta-vti-config.pl b/scripts/vyatta-vti-config.pl
index fbfad64..81abf97 100755
--- a/scripts/vyatta-vti-config.pl
+++ b/scripts/vyatta-vti-config.pl
@@ -25,7 +25,7 @@
#
# For each VTI tunnel (vpn ipsec site-to-site peer ip-address sti); find the vti tunnel, local address, mark.
# Find the corresponding tunnel (interfaces vti vtiXXX), tunnel address, disable, mtu
-# if not configured: ip tunnel add vtiXXX mode esp local $local remote $remote i_key $mark
+# if not configured: ip tunnel add vtiXXX mode esp local $local remote $remote ikey $mark okey $mark
# if (mtu): configure mtu
# if (tunnel-addres): configur ip link vtiXXX address
# if (!disable): enable the interface.
@@ -207,7 +207,7 @@ foreach my $peer (@peers) {
# By default we delete the tunnel...
my $genmark = $mark;
$gencmds .= "sudo /sbin/ip link delete $tunName type vti &> /dev/null\n";
- $gencmds .= "sudo /sbin/ip link add $tunName type vti local $lip remote $peer okey $genmark\n";
+ $gencmds .= "sudo /sbin/ip link add $tunName type vti local $lip remote $peer okey $genmark ikey $genmark\n";
foreach my $tunIP (@tunIPs) {
$gencmds .= "sudo /sbin/ip addr add $tunIP dev $tunName\n";
}
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/me/37/arw4utnegyuguuua
Default Alt Text
vpn.diff (1 KB)
Attached To
Mode
T137: IPSec s2s issue in daily build - VPN traffic works, but all other traffic is broken ...
Attached
Detach File
Event Timeline
Log In to Comment