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

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Christian Schmidt
2011-01-26 00:32:12 +01:00
parent caab8fb9e3 843f29e9b9
commit cf997605e5
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lfs/memtest
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
VER = 4.10
VER = 4.20
THISAPP = memtest86+-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2144f21d4489a04149b1891b8d97e8fc
$(DL_FILE)_MD5 = ef62c2f5be616676c8c62066dedc46b3
install : $(TARGET)

11
src/scripts/vpn-watch
View File

@@ -1,6 +1,6 @@
#!/usr/bin/perl
##################################################
##### VPN-Watch.pl Version 0.6 #####
##### VPN-Watch.pl Version 0.6a #####
##################################################
# #
# VPN-Watch is part of the IPFire Firewall #
@@ -31,8 +31,8 @@ while ( $i == 0){
$round++;
# Reset roundcounter after 10 min. To do established check.
if ($round > 9) { $round=0; }
# Reset roundcounter after 60 min. To do established check.
if ($round > 59) { $round=0; }
if (open(FILE, "<${General::swroot}/vpn/config")) { @vpnsettings = <FILE>;
close(FILE);
@@ -56,8 +56,9 @@ foreach (@vpnsettings){
if ($remoteip eq ""){next;if ($debug){logger("Unable to resolve $remotehostname.");}}
my $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`;
my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`;
if ( $round == 0 && $ipmatch eq '' && $status ne ''){
my $known= `echo "$status" | grep '$settings[2]'`;
if ( $ipmatch eq '' && $known ne '' ){
logger("Remote IP for host $remotehostname($remoteip) has changed, restarting ipsec.");
system("/usr/local/bin/ipsecctrl S $settings[0]");
$round=0;