From 331699d57658e651126bcbde4eb2e0753bbce1b1 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 22 Apr 2010 07:41:28 +0200 Subject: [PATCH] Change ipsecctrl Tunnel up and down. --- doc/packages-list.txt | 1 - src/misc-progs/ipsecctrl.c | 22 +++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index d5ed0ef143..ea1498dbc5 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 -* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 diff --git a/src/misc-progs/ipsecctrl.c b/src/misc-progs/ipsecctrl.c index d443edccfc..7205afb37c 100644 --- a/src/misc-progs/ipsecctrl.c +++ b/src/misc-progs/ipsecctrl.c @@ -138,33 +138,25 @@ int decode_line (char *s, void turn_connection_on (char *name, char *type) { char command[STRING_SIZE]; - safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); + safe_system("/usr/sbin/ipsec whack --rereadall >/dev/null"); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec auto --replace %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); + safe_system(command); + memset(command, 0, STRING_SIZE); + snprintf(command, STRING_SIZE - 1, + "/usr/sbin/ipsec up %s >/dev/null", name); safe_system(command); - if (strcmp(type, "net") == 0) { - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --asynchronous --name %s --initiate >/dev/null", name); - safe_system(command); - } } /* issue ipsec commmands to turn off connection 'name' */ void turn_connection_off (char *name) { char command[STRING_SIZE]; - - memset(command, 0, STRING_SIZE); - snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --name %s --terminate >/dev/null", name); - safe_system(command); memset(command, 0, STRING_SIZE); snprintf(command, STRING_SIZE - 1, - "/usr/sbin/ipsec whack --delete --name %s >/dev/null", name); + "/usr/sbin/ipsec down %s >/dev/null", name); safe_system(command); - safe_system("/usr/sbin/ipsec whack --rereadsecrets >/dev/null"); } -- 2.39.2