Fixed little typo.

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

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 08d562be8499bb44c75b31c2e60357625fd1649d..ee6807cdbc06e5d0cfcb1276f7601a3f43f9f4ed 100755 (executable)
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 ##################################################
-#####     VPN-Watch.pl     Version 0.4a      #####
+#####     VPN-Watch.pl     Version 0.6       #####
 ##################################################
 #                                                #
 #   VPN-Watch is part of the IPFire Firewall     #
@@ -24,17 +24,22 @@ if ( -e $file ){
   }
 
 system("echo $$ > $file");
-    
+my $round=0;
 while ( $i == 0){
-  if ($debug){logger("We will wait 300 seconds before next action.");}
-    sleep(300);
-  
-  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 10 min. To do established check.
+  if ($round > 9) { $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(/,/,$_);
 
@@ -49,13 +54,26 @@ foreach (@vpnsettings){
   
   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 ($debug){logger("Unable to resolve $remotehostname.");}}
-  my $connected= `ipsec whack --status | grep $remoteip`;
-  my $established= `ipsec whack --status | grep '$settings[2]' | grep 'IPsec SA established'`; 
+  my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`;
+  my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`;
   
-  if ( $established  eq '' || $connected eq '' ){
-    logger("Remote IP for host $remotehostname has changed or no connection is established, restarting connection to $remoteip.");
+  if ( $ipmatch eq '' && $status ne ''){
+    logger("Remote IP for host $remotehostname($remoteip) has changed, 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("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.");}
@@ -65,4 +83,3 @@ sub logger {
         my $log = shift;
         system("logger -t vpnwatch \"$log\"");
 }
-