webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

kleine Anpassung an ipsec

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@640 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-20 19:19:00 +00:00
parent 5b2a12ff8a
commit ad60e3ead1
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/cfgroot/general-functions.pl
View File

@@ -88,6 +88,7 @@ sub writehash
flock FILE, 2; flock FILE, 2;
foreach $var (keys %$hash) foreach $var (keys %$hash)
{ {
if ( $var eq "__CGI__"){next;}
$val = $hash->{$var}; $val = $hash->{$var};
# Darren Critchley Jan 17, 2003 added the following because when submitting with a graphic, the x and y # 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 # location of the mouse are submitted as well, this was being written to the settings file causing

2
src/misc-progs/ipsecctrl.c
View File

@@ -281,7 +281,7 @@ int main(int argc, char *argv[]) {
/* Get vpnwatch pid */ /* Get vpnwatch pid */
int fd; 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); close(fd);
safe_system("kill -9 $(cat /var/run/vpn-watch.pid)"); safe_system("kill -9 $(cat /var/run/vpn-watch.pid)");
safe_system("unlink /var/run/vpn-watch.pid)"); safe_system("unlink /var/run/vpn-watch.pid)");

23
src/scripts/vpn-watch
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl #!/usr/bin/perl
################################################## ##################################################
##### VPN-Watch.pl Version 0.1 ##### ##### VPN-Watch.pl Version 0.3 #####
################################################## ##################################################
use strict; use strict;
@@ -9,10 +9,17 @@ require '/var/ipfire/general-functions.pl';
my @vpnsettings; my @vpnsettings;
my $i = 0; my $i = 0;
my $file = "/var/run/vpn-watch.pid"; 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"); system("echo $$ > $file");
while ( $i == 0){ while ( $i == 0){
sleep(300);
if ($debug){logger("We will wait 300 seconds before next action.");}
if (open(FILE, "${General::swroot}/vpn/config")) { if (open(FILE, "${General::swroot}/vpn/config")) {
@vpnsettings = <FILE>; @vpnsettings = <FILE>;
close(FILE); close(FILE);
@@ -28,6 +35,9 @@ foreach (@vpnsettings){
if ($settings[29] ne 'on'){next;} if ($settings[29] ne 'on'){next;}
my $remotehostname = $settings[11]; 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); 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 ($remoteip eq ""){next;}
if (system("ipsec whack --status | grep $remoteip >/dev/null")){ if (system("ipsec whack --status | grep $remoteip >/dev/null")){
@@ -35,15 +45,8 @@ foreach (@vpnsettings){
system("/usr/local/bin/ipsecctrl S $settings[0]"); system("/usr/local/bin/ipsecctrl S $settings[0]");
next; next;
} }
my $hostip = `cat /var/ipfire/red/local-ipaddress 2>/dev/null`; if ($debug){logger("All connections may be fine nothing was done.");}
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);
} }
sub logger { sub logger {