aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2012-05-15 16:59:00 +0200
committerTobias Brunner <tobias@strongswan.org>2012-06-11 17:33:32 +0200
commitfff4b74db26968bac72ade4bd6c702be7b51ec7a (patch)
treef101045942fa34c0c93e9b828def87778feacb11 /src/starter
parent4a54860986e34f46183eebe60d7af767de7ddf25 (diff)
downloadstrongswan-fff4b74db26968bac72ade4bd6c702be7b51ec7a.tar.bz2
strongswan-fff4b74db26968bac72ade4bd6c702be7b51ec7a.tar.xz
Bye bye Pluto!
Charon will take over IKEv1 duties from here. This also removes libfreeswan and whack.
Diffstat (limited to 'src/starter')
-rw-r--r--src/starter/Android.mk4
-rw-r--r--src/starter/Makefile.am4
-rw-r--r--src/starter/confread.c12
-rw-r--r--src/starter/files.h4
4 files changed, 1 insertions, 23 deletions
diff --git a/src/starter/Android.mk b/src/starter/Android.mk
index 05f28fe45..c7e81d284 100644
--- a/src/starter/Android.mk
+++ b/src/starter/Android.mk
@@ -20,10 +20,6 @@ LOCAL_C_INCLUDES += \
LOCAL_CFLAGS := $(strongswan_CFLAGS) -DSTART_CHARON \
-DPLUGINS='"$(strongswan_STARTER_PLUGINS)"'
-ifneq ($(strongswan_BUILD_PLUTO),)
-LOCAL_CFLAGS += -DSTART_PLUTO
-endif
-
LOCAL_MODULE := starter
LOCAL_MODULE_TAGS := optional
diff --git a/src/starter/Makefile.am b/src/starter/Makefile.am
index 37aa7f219..7888b85bc 100644
--- a/src/starter/Makefile.am
+++ b/src/starter/Makefile.am
@@ -29,10 +29,6 @@ EXTRA_DIST = keywords.txt ipsec.conf Android.mk
MAINTAINERCLEANFILES = keywords.c
BUILT_SOURCES = parser.h
-if USE_PLUTO
- AM_CFLAGS += -DSTART_PLUTO
-endif
-
if USE_CHARON
AM_CFLAGS += -DSTART_CHARON
endif
diff --git a/src/starter/confread.c b/src/starter/confread.c
index 55392c207..f78a06112 100644
--- a/src/starter/confread.c
+++ b/src/starter/confread.c
@@ -77,9 +77,6 @@ static void default_values(starter_config_t *cfg)
#ifdef START_CHARON
cfg->setup.charonstart = TRUE;
#endif
-#ifdef START_PLUTO
- cfg->setup.plutostart = TRUE;
-#endif
cfg->conn_default.seen = SEEN_NONE;
cfg->conn_default.startup = STARTUP_NO;
@@ -143,20 +140,13 @@ static void load_setup(starter_config_t *cfg, config_parsed_t *cfgp)
}
}
- /* verify the executables are actually available (some distros split
- * packages but enabled both) */
+ /* verify the executables are actually available */
#ifdef START_CHARON
cfg->setup.charonstart = cfg->setup.charonstart &&
daemon_exists("charon", CHARON_CMD);
#else
cfg->setup.charonstart = FALSE;
#endif
-#ifdef START_PLUTO
- cfg->setup.plutostart = cfg->setup.plutostart &&
- daemon_exists("pluto", PLUTO_CMD);
-#else
- cfg->setup.plutostart = FALSE;
-#endif
}
static void kw_end(starter_conn_t *conn, starter_end_t *end, kw_token_t token,
diff --git a/src/starter/files.h b/src/starter/files.h
index 88857c0b2..96b76fdf1 100644
--- a/src/starter/files.h
+++ b/src/starter/files.h
@@ -24,10 +24,6 @@
#define CONFIG_FILE IPSEC_CONFDIR "/ipsec.conf"
#define SECRETS_FILE IPSEC_CONFDIR "/ipsec.secrets"
-#define PLUTO_CMD IPSEC_DIR "/pluto"
-#define PLUTO_CTL_FILE IPSEC_PIDDIR "/pluto.ctl"
-#define PLUTO_PID_FILE IPSEC_PIDDIR "/pluto.pid"
-
#define CHARON_CMD IPSEC_DIR "/charon"
#define CHARON_CTL_FILE IPSEC_PIDDIR "/charon.ctl"
#define CHARON_PID_FILE IPSEC_PIDDIR "/charon.pid"