diff options
Diffstat (limited to 'src/starter/files.h')
| -rw-r--r-- | src/starter/files.h | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/src/starter/files.h b/src/starter/files.h index 61f03b84e..39b89bc2d 100644 --- a/src/starter/files.h +++ b/src/starter/files.h @@ -17,36 +17,26 @@ #ifndef _STARTER_FILES_H_ #define _STARTER_FILES_H_ -#ifndef DEFAULT_CTLBASE -#define DEFAULT_CTLBASE "/var/run/pluto" -#endif -#define CTL_SUFFIX ".ctl" -#define PID_SUFFIX ".pid" - -#define MY_PID_FILE "/var/run/starter.pid" +#define STARTER_PID_FILE IPSEC_PIDDIR "/starter.pid" #define DEV_RANDOM "/dev/random" #define DEV_URANDOM "/dev/urandom" +#define PROC_NETKEY "/proc/net/pfkey" +#define PROC_MODULES "/proc/modules" -#define PROC_NETKEY "/proc/net/pfkey" -#define PROC_IPSECVERSION "/proc/net/ipsec_version" -#define PROC_SYSFLAGS "/proc/sys/net/ipsec" -#define PROC_MODULES "/proc/modules" - -#define CONFIG_FILE IPSEC_CONFDIR"/ipsec.conf" -#define SECRETS_FILE IPSEC_CONFDIR"/ipsec.secrets" +#define CONFIG_FILE IPSEC_CONFDIR "/ipsec.conf" +#define SECRETS_FILE IPSEC_CONFDIR "/ipsec.secrets" -#define PLUTO_CMD IPSEC_EXECDIR"/pluto" -#define PLUTO_CTL_FILE DEFAULT_CTLBASE CTL_SUFFIX -#define PLUTO_PID_FILE DEFAULT_CTLBASE PID_SUFFIX +#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_EXECDIR"/charon" -#define CHARON_BASE "/var/run/charon" -#define CHARON_CTL_FILE CHARON_BASE CTL_SUFFIX -#define CHARON_PID_FILE CHARON_BASE PID_SUFFIX +#define CHARON_CMD IPSEC_DIR "/charon" +#define CHARON_CTL_FILE IPSEC_PIDDIR "/charon.ctl" +#define CHARON_PID_FILE IPSEC_PIDDIR "/charon.pid" -#define DYNIP_DIR "/var/run/dynip" -#define INFO_FILE "/var/run/ipsec.info" +#define DYNIP_DIR IPSEC_PIDDIR "/dynip" +#define INFO_FILE IPSEC_PIDDIR "/ipsec.info" #endif /* _STARTER_FILES_H_ */ |