Merge branch 'master' into next

[ipfire-2.x.git] / src / scripts / vpn-watch

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index ee6807cdbc06e5d0cfcb1276f7601a3f43f9f4ed..2bd516840adf1a10d6e649fcfeb32d2f38c83d94 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 ##################################################
-#####     VPN-Watch.pl     Version 0.6       #####
+#####     VPN-Watch.pl     Version 0.6a      #####
 ##################################################
 #                                                #
 #   VPN-Watch is part of the IPFire Firewall     #
@@ -31,8 +31,8 @@ while ( $i == 0){
 
   $round++;
 
-   # Reset roundcounter after 10 min. To do established check.
-  if ($round > 9) { $round=0; }
+   # Reset roundcounter after 60 min. To do established check.
+  if ($round > 59) { $round=0; }
 
   if (open(FILE, "<${General::swroot}/vpn/config")) {    @vpnsettings = <FILE>;
     close(FILE);
@@ -43,6 +43,7 @@ my $status = `ipsec whack --status`;
 foreach (@vpnsettings){
  my @settings = split(/,/,$_);
 
+  if ($settings[30] eq 'ikev2'){next;}
   if ($settings[27] ne 'RED'){next;}
   if ($settings[4] ne 'net'){next;}  
   if ($settings[1] ne 'on'){next;}chomp($settings[29]);
@@ -56,8 +57,9 @@ foreach (@vpnsettings){
   if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
   my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`;
   my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`;
-  
-  if ( $ipmatch eq '' && $status ne ''){
+  my $known= `echo "$status" | grep '$settings[2]'`;
+
+  if ( $ipmatch eq '' && $known ne '' ){
     logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec.");
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     $round=0;