diff options
| author | Martin Willi <martin@strongswan.org> | 2006-06-23 14:02:30 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2006-06-23 14:02:30 +0000 |
| commit | 2f89902d071d76f8226939193c692badbd86e251 (patch) | |
| tree | 2d3621e375b02f778c993e2fee23e5cca04e7198 /src/charon/config/configuration.c | |
| parent | 2891590b054da6bedcfdeb3a94cfe6416a1953b9 (diff) | |
| download | strongswan-2f89902d071d76f8226939193c692badbd86e251.tar.bz2 strongswan-2f89902d071d76f8226939193c692badbd86e251.tar.xz | |
applied new changes from NATT team
DPD only done when no IPsec and IKE traffic processed
minor changes here and there
Diffstat (limited to 'src/charon/config/configuration.c')
| -rwxr-xr-x | src/charon/config/configuration.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/charon/config/configuration.c b/src/charon/config/configuration.c index 9e44a0ef9..cd205867e 100755 --- a/src/charon/config/configuration.c +++ b/src/charon/config/configuration.c @@ -56,12 +56,6 @@ #define KEEPALIVE_INTERVAL 2000000 /** - * Keepalive timeout in milliseconds. - * Not implemented yet. - */ -#define KEEPALIVE_TIMEOUT 30000000 - -/** * DPD interval in milliseconds. */ #define DPD_INTERVAL 6000000 @@ -113,14 +107,6 @@ static u_int32_t get_keepalive_interval (private_configuration_t *this) } /** - * Implementation of configuration_t.get_keepalive_timeout. - */ -static u_int32_t get_keepalive_timeout (private_configuration_t *this) -{ - return KEEPALIVE_TIMEOUT; -} - -/** * Implementation of configuration_t.get_dpd_interval. */ static u_int32_t get_dpd_interval (private_configuration_t *this) @@ -148,7 +134,6 @@ configuration_t *configuration_create() this->public.get_retransmit_timeout = (status_t (*) (configuration_t *, u_int32_t retransmit_count, u_int32_t *timeout))get_retransmit_timeout; this->public.get_half_open_ike_sa_timeout = (u_int32_t (*) (configuration_t *)) get_half_open_ike_sa_timeout; this->public.get_keepalive_interval = (u_int32_t (*) (configuration_t *)) get_keepalive_interval; - this->public.get_keepalive_timeout = (u_int32_t (*) (configuration_t *)) get_keepalive_timeout; this->public.get_dpd_interval = (u_int32_t (*) (configuration_t *)) get_dpd_interval; return (&this->public); |