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=3abb7f5c1f3613066816d7a87aefc09b7f4ee36d;hb=64bd20c56c090bec348661686422842826360d1c;hpb=ad60e3ead19a04748bd12407d235156a3eea56e2

diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index 3abb7f5c1f..3f7757adb2 100755
--- 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.4c      #####
+##################################################
+#                                                #
+#   VPN-Watch is part of the IPFire Firewall     #
+#                                                #
+##################################################
 
 use strict;
 
@@ -11,21 +15,27 @@ 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");
     
 while ( $i == 0){
- sleep(300);
-  if ($debug){logger("We will wait 300 seconds before next action.");}
+  if ($debug){logger("We will wait 60 seconds before next action.");}
+    sleep(60);
   
-  if (open(FILE, "${General::swroot}/vpn/config")) {
+  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(/,/,$_);
 
@@ -39,17 +49,20 @@ 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.");
-    system("/usr/local/bin/ipsecctrl S $settings[0]");
-    next;
+  if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
+  my $ipmatch= `echo "$status" | grep $remoteip | grep $settings[2]`;
+  
+  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
   }
- if ($debug){logger("All connections may be fine nothing was done.");}
  }
+ if ($debug){logger("All connections may be fine nothing was done.");}
 }
 
 sub logger {
         my $log = shift;
         system("logger -t vpnwatch \"$log\"");
 }
+