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 734b67d20dd9f27b0214b129929a063d16671fa4 (commit) from 1f324fd71d0dac2e538466ec851a32689df2d896 (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 734b67d20dd9f27b0214b129929a063d16671fa4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Jun 25 00:00:51 2010 +0200

ipsecctrl: use ipsec restart to turn connection on.

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

Summary of changes: src/misc-progs/ipsecctrl.c | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-)

Difference in files: diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index 085feab..1dd05ea 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -142,14 +142,13 @@ int decode_line (char *s, */ void turn_connection_on (char *name, char *type) { char command[STRING_SIZE]; - - safe_system("/usr/sbin/ipsec reload >/dev/null"); - memset(command, 0, STRING_SIZE); - /* give ipsec time to be ready */ - safe_system("/bin/sleep 5"); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec up %s >/dev/null", name); - safe_system(command); + if (file = fopen("/var/run/vpn-watch.pid", "r")) { + safe_system("kill -9 $(cat /var/run/vpn-watch.pid)"); + safe_system("unlink /var/run/vpn-watch.pid"); + close(file); + } + safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null"); + safe_system("/usr/local/bin/vpn-watch &"); } /* issue ipsec commmands to turn off connection 'name' @@ -192,11 +191,6 @@ int main(int argc, char *argv[]) {

/* Get vpnwatch pid */

- if ( (argc == 2) && (file = fopen("/var/run/vpn-watch.pid", "r"))) { - safe_system("kill -9 $(cat /var/run/vpn-watch.pid)"); - safe_system("unlink /var/run/vpn-watch.pid"); - close(file); - }

/* FIXME: workaround for pclose() issue - still no real idea why * this is happening */ @@ -342,8 +336,6 @@ int main(int argc, char *argv[]) {

// start the system if ((argc == 2) && strcmp(argv[1], "S") == 0) { - safe_system("/etc/rc.d/init.d/ipsec restart >/dev/null"); - safe_system("/usr/local/bin/vpn-watch &"); exit(0); }

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