diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2009-08-28 17:04:35 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2009-09-01 12:54:33 +0200 |
| commit | e75f4237536a84938ac1b33f143d63512710ff29 (patch) | |
| tree | 5745c3ca28ebaced87c1b56dff1194815b64266a /src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | |
| parent | abff49a7ffd0b4941ec302e587b2701327f32864 (diff) | |
| download | strongswan-e75f4237536a84938ac1b33f143d63512710ff29.tar.bz2 strongswan-e75f4237536a84938ac1b33f143d63512710ff29.tar.xz | |
Refactored the lifetime_cfg_t struct to be simpler and more expressive. Initialization is now static.
Diffstat (limited to 'src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c')
| -rw-r--r-- | src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index 4eff8e259..002e1bee8 100644 --- a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -1287,18 +1287,18 @@ static status_t add_sa(private_kernel_pfkey_ipsec_t *this, lft = (struct sadb_lifetime*)PFKEY_EXT_ADD_NEXT(msg); lft->sadb_lifetime_exttype = SADB_EXT_LIFETIME_SOFT; lft->sadb_lifetime_len = PFKEY_LEN(sizeof(struct sadb_lifetime)); - lft->sadb_lifetime_allocations = lifetime->rekey_packets; - lft->sadb_lifetime_bytes = lifetime->rekey_bytes; - lft->sadb_lifetime_addtime = lifetime->rekey_time; + lft->sadb_lifetime_allocations = lifetime->packets.rekey; + lft->sadb_lifetime_bytes = lifetime->bytes.rekey; + lft->sadb_lifetime_addtime = lifetime->time.rekey; lft->sadb_lifetime_usetime = 0; /* we only use addtime */ PFKEY_EXT_ADD(msg, lft); lft = (struct sadb_lifetime*)PFKEY_EXT_ADD_NEXT(msg); lft->sadb_lifetime_exttype = SADB_EXT_LIFETIME_HARD; lft->sadb_lifetime_len = PFKEY_LEN(sizeof(struct sadb_lifetime)); - lft->sadb_lifetime_allocations = lifetime->life_packets; - lft->sadb_lifetime_bytes = lifetime->life_bytes; - lft->sadb_lifetime_addtime = lifetime->life_time; + lft->sadb_lifetime_allocations = lifetime->packets.life; + lft->sadb_lifetime_bytes = lifetime->bytes.life; + lft->sadb_lifetime_addtime = lifetime->time.life; lft->sadb_lifetime_usetime = 0; /* we only use addtime */ PFKEY_EXT_ADD(msg, lft); |