From ad60e3ead19a04748bd12407d235156a3eea56e2 Mon Sep 17 00:00:00 2001
From: maniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Wed, 20 Jun 2007 19:19:00 +0000
Subject: [PATCH] kleine Anpassung an ipsec

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@640 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 config/cfgroot/general-functions.pl |  1 +
 src/misc-progs/ipsecctrl.c          |  2 +-
 src/scripts/vpn-watch               | 23 +++++++++++++----------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 78f925f70..a5862e8d0 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -88,6 +88,7 @@ sub writehash
 	flock FILE, 2;
 	foreach $var (keys %$hash) 
 	{
+		if ( $var eq "__CGI__"){next;}
 		$val = $hash->{$var};
 		# Darren Critchley Jan 17, 2003 added the following because when submitting with a graphic, the x and y
 		# location of the mouse are submitted as well, this was being written to the settings file causing
diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c
index b872bdac3..05c8de34a 100644
--- a/src/misc-progs/ipsecctrl.c
+++ b/src/misc-progs/ipsecctrl.c
@@ -281,7 +281,7 @@ int main(int argc, char *argv[]) {
 		
  /* Get vpnwatch pid */
  int fd;
- if ((fd = open("/var/run/vpn-watch.pid", O_RDONLY)) != -1) {
+ if (( fd = open("/var/run/vpn-watch.pid", O_RDONLY)) != "" ) {
  close(fd);
  safe_system("kill -9 $(cat /var/run/vpn-watch.pid)");
  safe_system("unlink /var/run/vpn-watch.pid)");
diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch
index cd65a1d02..3abb7f5c1 100755
--- a/src/scripts/vpn-watch
+++ b/src/scripts/vpn-watch
@@ -1,6 +1,6 @@
 #!/usr/bin/perl 
 ################################################## 
-#####     VPN-Watch.pl     Version 0.1       ##### 
+#####     VPN-Watch.pl     Version 0.3       ##### 
 ################################################## 
 
 use strict;
@@ -9,10 +9,17 @@ require '/var/ipfire/general-functions.pl';
 my @vpnsettings;
 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.");}
 
 system("echo $$ > $file");
     
 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>;
     close(FILE);
@@ -28,6 +35,9 @@ foreach (@vpnsettings){
   if ($settings[29] ne 'on'){next;}
  
   my $remotehostname = $settings[11];
+  
+  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")){
@@ -35,15 +45,8 @@ foreach (@vpnsettings){
     system("/usr/local/bin/ipsecctrl S $settings[0]");
     next;
   }
-  my $hostip = `cat /var/ipfire/red/local-ipaddress 2>/dev/null`;
-  chomp($hostip);
-  if (system("ipsec whack --status | grep $hostip >/dev/null")){
-    logger("Our own IP has changed to $hostip restarting connection.");
-    system("/usr/local/bin/ipsecctrl S $settings[1]");
-    next;}  
-  }
-  logger("Nothing was done.");
-  sleep(300);
+ if ($debug){logger("All connections may be fine nothing was done.");}
+ }
 }
 
 sub logger {