diff --git a/config/rootfiles/core/51/update.sh b/config/rootfiles/core/51/update.sh index 201c2db4a..58a47da0d 100644 --- a/config/rootfiles/core/51/update.sh +++ b/config/rootfiles/core/51/update.sh @@ -143,6 +143,11 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # rm -rf /etc/sysconfig/lm_sensors +# Ensure that all data was written... +sync +sync +sync + # Reboot message to console /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Upgrade finished. If you use a customized grub.cfg" /usr/bin/logger -p syslog.emerg -t core-upgrade-51 "Check it before reboot !!!" @@ -155,5 +160,12 @@ touch /var/run/need_reboot #Finish /etc/init.d/fireinfo start sendprofile + +# Ensure that all data was written... +sync +sync +sync + +# #Don't report the exitcode last command exit 0 diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index 4a6ca2a09..322b3c39c 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.i586-full-core50.iso.torrent +var/ipfire/seeder/ipfire-2.9.i586-full-core51.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 888372e01..e1a820094 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -439,6 +439,7 @@ sub writeipsecfiles { # Automatically start only if a net-to-net connection if ($lconfighash{$key}[3] eq 'host') { print CONF "\tauto=add\n"; + print CONF "\trightsourceip=$lvpnsettings{'RW_NET'}\n"; } else { print CONF "\tauto=start\n"; } diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index a4e120bd8..0fd2f3c91 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core50.iso.torrent +DL_FILE = ipfire-2.9.i586-full-core51.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 26 +PAK_VER = 27 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 07d3b03c3042f67464a33319207d2795 +$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76 install : $(TARGET) diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index a018289f6..0b0517713 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -142,10 +142,42 @@ int decode_line (char *s, */ void turn_connection_on (char *name, char *type) { /* - if you find a way to start a single connection without changing all add it - here. Change also vpn-watch. + Rename the connection and run ipsec update and rename it back to readd + a deleted connection. Because ipsec update ignores connection that have + not changed since last load. */ - safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null"); + char command[STRING_SIZE]; + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s$|conn %s-renamed|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); + + sleep(1); + + // Back to original name + snprintf(command, STRING_SIZE - 1, + "sed -i -e 's|^conn %s-renamed$|conn %s|g' /var/ipfire/vpn/ipsec.conf >/dev/null", name, name); + safe_system(command); + + // Down and delete IKEv2 Tunnel before ipsec update + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke down %s-renamed >/dev/null", name); + safe_system(command); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec stroke delete %s-renamed >/dev/null", name); + safe_system(command); + + safe_system("/etc/rc.d/init.d/ipsec update >/dev/null"); } /* issue ipsec commmands to turn off connection 'name' @@ -162,6 +194,7 @@ void turn_connection_off (char *name) { snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec stroke delete %s >/dev/null", name); safe_system(command); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); safe_system("/usr/sbin/ipsec stroke rereadall >/dev/null"); diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index 63b2442ca..563c14c47 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -1,6 +1,6 @@ #!/usr/bin/perl ################################################## -##### VPN-Watch.pl Version 0.6a ##### +##### VPN-Watch.pl Version 0.7 ##### ################################################## # # # VPN-Watch is part of the IPFire Firewall # @@ -39,12 +39,11 @@ while ( $i == 0){ unless(@vpnsettings) {exit 1;} } -my $status = `ipsec whack --status`; +my $status = `ipsec status`; foreach (@vpnsettings){ my @settings = split(/,/,$_); chomp($settings[30]); - if ($settings[30] eq 'ikev2'){next;} if ($settings[27] ne 'RED'){next;} if ($settings[4] ne 'net'){next;} if ($settings[1] ne 'on'){next;}chomp($settings[29]); @@ -57,15 +56,13 @@ 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 $ipmatch= `echo "$status" | grep '$remoteip' | grep '$settings[2]'`; - my $established= `echo "$status" | grep '$settings[2]' | grep 'erouted;'`; + my $established= `echo "$status" | grep '$settings[2]' | grep -e 'erouted;' -e 'INSTALLED'`; 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; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } if ($debug){logger("Round=".$round." and established=".$established);} @@ -74,8 +71,6 @@ foreach (@vpnsettings){ logger("Connection to $remotehostname($remoteip) not erouted, restarting ipsec."); system("/usr/local/bin/ipsecctrl S $settings[0]"); $round=0; - last; #all connections will reloaded - #remove this if ipsecctrl can restart single con again } }