From f3131ceca70e295b455fc9dd9f97842339a84d26 Mon Sep 17 00:00:00 2001
From: Masakazu Asama <m-asama@ginzado.co.jp>
Date: Thu, 29 May 2014 14:34:11 +0900
Subject: Add support for IPsec phase 1 ID of IPv4 address format

---
 scripts/vpn-config.pl | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vpn-config.pl b/scripts/vpn-config.pl
index 4870d48..bda6318 100755
--- a/scripts/vpn-config.pl
+++ b/scripts/vpn-config.pl
@@ -591,7 +591,13 @@ if ( $vcVPN->exists('ipsec') ) {
           $genout .= "\tleft=$lip\n";
           $leftsourceip = "\tleftsourceip=$lip\n";
         }
-        $genout .= "\tleftid=$authid\n" if defined $authid;
+        if ( defined($authid) ) {
+          if ( $authid =~ m/^\@/ ) {
+            $genout .= "\tleftid=\"$authid\"\n";
+          } else {
+            $genout .= "\tleftid=$authid\n";
+          }
+        }
       }
 
       # @SM Todo: must have explicit settings for VTI.
@@ -601,9 +607,13 @@ if ( $vcVPN->exists('ipsec') ) {
       if ( $peer =~ /^\@/ ) {
 
         # peer is an "ID"
-        $rightid  = $peer;
+        if ( defined($authremoteid) ) {
+          $rightid = $authremoteid;
+        } else {
+          $rightid = $peer;
+        }
         $any_peer = 1;
-      } elsif ($authremoteid) {
+      } elsif ( defined($authremoteid) ) {
         $rightid = $authremoteid;
       }
       if ( ( $peer eq 'any' )
@@ -621,7 +631,13 @@ if ( $vcVPN->exists('ipsec') ) {
         $right = $peer;
       }
       $genout .= "\tright=$right\n";
-      $genout .= "\trightid=\"$rightid\"\n" if ( defined($rightid) );
+      if ( defined($rightid) ) {
+        if ( $rightid =~ m/^\@/ ) {
+          $genout .= "\trightid=\"$rightid\"\n";
+        } else {
+          $genout .= "\trightid=$rightid\n";
+        }
+      }
       if ($any_peer) {
         $genout .= "\trekey=no\n";
       }
-- 
cgit v1.2.3