Merge branch 'master' into next

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

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 3abb7f5c1f3613066816d7a87aefc09b7f4ee36d..63b2442caf7fd57d0be4100e2e9de05dfc998e06 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,7 +1,11 @@
 #!/usr/bin/perl 
-################################################## 
-#####     VPN-Watch.pl     Version 0.3       ##### 
-################################################## 
+##################################################
+#####     VPN-Watch.pl     Version 0.6a      #####
+##################################################
+#                                                #
+#   VPN-Watch is part of the IPFire Firewall     #
+#                                                #
+##################################################
 
 use strict;
 
@@ -11,24 +15,36 @@ my $i = 0;
 my $file = "/var/run/vpn-watch.pid";
 my $debug = 0;
 
-if ( -e $file ){logger("There my be another vpn-watch runnning $file exists, vpn-watch will not start.");exit 1;}
-if ($debug){logger("Call of vpn-watch pid not is not existing.");}
+if ( -e $file ){
+  logger("There my be another vpn-watch runnning because $file exists, vpn-watch will try kill the process.");
+  open(FILE, "<$file");
+    my $PID = <FILE>;
+    close(FILE);
+    system("kill -9 $PID");
+  }
 
 system("echo $$ > $file");
-    
+my $round=0;
 while ( $i == 0){
- sleep(300);
-  if ($debug){logger("We will wait 300 seconds before next action.");}
-  
-  if (open(FILE, "${General::swroot}/vpn/config")) {
-    @vpnsettings = <FILE>;
+  if ($debug){logger("We will wait 60 seconds before next action.");}
+    sleep(60);
+
+  $round++;
+
+   # 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);
     unless(@vpnsettings) {exit 1;}
   }
 
+my $status = `ipsec whack --status`;
 foreach (@vpnsettings){
  my @settings = split(/,/,$_);
-
+  
+  chomp($settings[30]);
+  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]);
@@ -39,14 +55,31 @@ foreach (@vpnsettings){
   if ($debug){logger("Checking connection to $remotehostname.");}
   
   my $remoteip = `/usr/bin/ping -c 1 $remotehostname 2>/dev/null | head -n1 | awk '{print \$3}' | tr -d '()' | tr -d ':'`;chomp($remoteip);
-  if ($remoteip eq ""){next;}
-  if (system("ipsec whack --status | grep $remoteip >/dev/null")){
-    logger("Remote IP for host $remotehostname has changed or is not connected, restarting connection to $remoteip.");
+  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;'`;
+  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]");
-    next;
+    $round=0;
+    last; #all connections will reloaded
+          #remove this if ipsecctrl can restart single con again
+  }
+
+  if ($debug){logger("Round=".$round." and established=".$established);}
+
+  if ( ($round == 0) && ($established eq '')) {
+    logger("Connection to $remotehostname($remoteip) not erouted, restarting ipsec.");
+    system("/usr/local/bin/ipsecctrl S $settings[0]");
+    $round=0;
+    last; #all connections will reloaded
+          #remove this if ipsecctrl can restart single con again
+
   }
- if ($debug){logger("All connections may be fine nothing was done.");}
  }
+ if ($debug){logger("All connections may be fine nothing was done.");}
 }
 
 sub logger {