This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 90070fc927c8d8a3a37d0eb818a2c611c4e62fc7 (commit) via af0e9924804e241452f2efbb2e12ca7dacf8385a (commit) from a4c768798014c7f9b3bf54ee37eef44944765786 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 90070fc927c8d8a3a37d0eb818a2c611c4e62fc7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jun 21 23:13:06 2010 +0200

Fix ipsecctrl hang at start of a connection. Fixes bug #0000663

commit af0e9924804e241452f2efbb2e12ca7dacf8385a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jun 21 23:11:41 2010 +0200

"All connection fine" message now only showed one time.

-----------------------------------------------------------------------

Summary of changes: src/misc-progs/ipsecctrl.c | 2 ++ src/scripts/vpn-watch | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)

Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 16fc86b..d974d6c 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -140,6 +140,8 @@ void turn_connection_on (char *name, char *type) {

safe_system("/usr/sbin/ipsec reload >/dev/null"); memset(command, 0, STRING_SIZE); + /* give ipsec time to be ready */ + safe_system("/bin/sleep 2"); snprintf(command, STRING_SIZE - 1, "/usr/sbin/ipsec up %s >/dev/null", name); safe_system(command); diff --git a/src/scripts/vpn-watch b/src/scripts/vpn-watch index c533f06..08d562b 100755 --- a/src/scripts/vpn-watch +++ b/src/scripts/vpn-watch @@ -57,8 +57,8 @@ foreach (@vpnsettings){ system("/usr/local/bin/ipsecctrl S $settings[0]"); 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 {

hooks/post-receive -- IPFire 2.x development tree