X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fvpn-watch;h=3f7757adb288973773133fe2a5dd7e302b41a798;hp=08d562be8499bb44c75b31c2e60357625fd1649d;hb=64bd20c56c090bec348661686422842826360d1c;hpb=af0e9924804e241452f2efbb2e12ca7dacf8385a

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 08d562be84..3f7757adb2 100755
--- 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.4c      #####
 ##################################################
 #                                                #
 #   VPN-Watch is part of the IPFire Firewall     #
@@ -26,8 +26,8 @@ if ( -e $file ){
 system("echo $$ > $file");
     
 while ( $i == 0){
-  if ($debug){logger("We will wait 300 seconds before next action.");}
-    sleep(300);
+  if ($debug){logger("We will wait 60 seconds before next action.");}
+    sleep(60);
   
   if (open(FILE, "<${General::swroot}/vpn/config")) {
     @vpnsettings = <FILE>;
@@ -35,6 +35,7 @@ while ( $i == 0){
     unless(@vpnsettings) {exit 1;}
   }
 
+my $status = `ipsec whack --status`;
 foreach (@vpnsettings){
  my @settings = split(/,/,$_);
 
@@ -49,12 +50,11 @@ 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]`;
   
-  if ( $established  eq '' || $connected eq '' ){
-    logger("Remote IP for host $remotehostname has changed or no connection is established, restarting connection to $remoteip.");
-    system("/usr/local/bin/ipsecctrl S $settings[0]");
+  if ( $ipmatch eq '' ){
+    logger("Remote IP for host $remotehostname-$remoteip has changed, restarting ipsec.");
+    system("/usr/local/bin/ipsecctrl S");
     last; #all connections will reloaded
   }
  }