diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-05-15 16:37:02 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-06-11 17:33:32 +0200 |
| commit | ee3026a1e270d73042b245ed5de1c8dcb24cf698 (patch) | |
| tree | 120d56b1c5fccf0b0742ec9ae53fce85faadd2c9 /src/starter/confread.c | |
| parent | 5b09310e67a0bb1d9f1aaf07fdc80b297aef4791 (diff) | |
| download | strongswan-ee3026a1e270d73042b245ed5de1c8dcb24cf698.tar.bz2 strongswan-ee3026a1e270d73042b245ed5de1c8dcb24cf698.tar.xz | |
starter: Remove all ties to pluto/libfreeswan.
Moved some types/constants in the process.
Diffstat (limited to 'src/starter/confread.c')
| -rw-r--r-- | src/starter/confread.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/starter/confread.c b/src/starter/confread.c index d6d36fade..55392c207 100644 --- a/src/starter/confread.c +++ b/src/starter/confread.c @@ -24,14 +24,16 @@ #include <library.h> #include <debug.h> -#include "../pluto/constants.h" -#include "../pluto/defs.h" - #include "keywords.h" #include "confread.h" #include "args.h" #include "files.h" +#define IKE_LIFETIME_DEFAULT 10800 /* 3 hours */ +#define IPSEC_LIFETIME_DEFAULT 3600 /* 1 hour */ +#define SA_REPLACEMENT_MARGIN_DEFAULT 540 /* 9 minutes */ +#define SA_REPLACEMENT_FUZZ_DEFAULT 100 /* 100% of margin */ +#define SA_REPLACEMENT_RETRIES_DEFAULT 3 static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; static const char esp_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; @@ -87,8 +89,8 @@ static void default_values(starter_config_t *cfg) cfg->conn_default.ike = strdupnull(ike_defaults); cfg->conn_default.esp = strdupnull(esp_defaults); - cfg->conn_default.sa_ike_life_seconds = OAKLEY_ISAKMP_SA_LIFETIME_DEFAULT; - cfg->conn_default.sa_ipsec_life_seconds = PLUTO_SA_LIFE_DURATION_DEFAULT; + cfg->conn_default.sa_ike_life_seconds = IKE_LIFETIME_DEFAULT; + cfg->conn_default.sa_ipsec_life_seconds = IPSEC_LIFETIME_DEFAULT; cfg->conn_default.sa_rekey_margin = SA_REPLACEMENT_MARGIN_DEFAULT; cfg->conn_default.sa_rekey_fuzz = SA_REPLACEMENT_FUZZ_DEFAULT; cfg->conn_default.sa_keying_tries = SA_REPLACEMENT_RETRIES_DEFAULT; |