denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Terminology and return value of get_lifetime of child_sa_t corrected.

Browse Source
This commit is contained in:
Tobias Brunner
2009-09-01 12:53:44 +02:00
parent cb123493d1
commit e3c7e72973
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/child_sa.c
+2 -2
View File
@@ -507,7 +507,7 @@ static void get_usestats(private_child_sa_t *this, bool inbound,
/** /**
* Implementation of child_sa_t.get_lifetime * Implementation of child_sa_t.get_lifetime
*/ */
static u_int32_t get_lifetime(private_child_sa_t *this, bool hard) static time_t get_lifetime(private_child_sa_t *this, bool hard)
{ {
return hard ? this->expire_time : this->rekey_time; return hard ? this->expire_time : this->rekey_time;
} }
@@ -895,7 +895,7 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
this->public.set_mode = (void(*)(child_sa_t*, ipsec_mode_t mode))set_mode; this->public.set_mode = (void(*)(child_sa_t*, ipsec_mode_t mode))set_mode;
this->public.get_proposal = (proposal_t*(*)(child_sa_t*))get_proposal; this->public.get_proposal = (proposal_t*(*)(child_sa_t*))get_proposal;
this->public.set_proposal = (void(*)(child_sa_t*, proposal_t *proposal))set_proposal; this->public.set_proposal = (void(*)(child_sa_t*, proposal_t *proposal))set_proposal;
this->public.get_lifetime = (u_int32_t(*)(child_sa_t*, bool))get_lifetime; this->public.get_lifetime = (time_t(*)(child_sa_t*, bool))get_lifetime;
this->public.get_usestats = (void(*)(child_sa_t*,bool,time_t*,u_int64_t*))get_usestats; this->public.get_usestats = (void(*)(child_sa_t*,bool,time_t*,u_int64_t*))get_usestats;
this->public.has_encap = (bool(*)(child_sa_t*))has_encap; this->public.has_encap = (bool(*)(child_sa_t*))has_encap;
this->public.get_ipcomp = (ipcomp_transform_t(*)(child_sa_t*))get_ipcomp; this->public.get_ipcomp = (ipcomp_transform_t(*)(child_sa_t*))get_ipcomp;
src/charon/sa/child_sa.h
+3 -3
View File
@@ -229,12 +229,12 @@ struct child_sa_t {
bool (*has_encap)(child_sa_t *this); bool (*has_encap)(child_sa_t *this);
/** /**
* Get the lifetime of the CHILD_SA. * Get the absolute time when the CHILD_SA expires or gets rekeyed.
* *
* @param hard TRUE for hard lifetime, FALSE for soft (rekey) lifetime * @param hard TRUE for hard lifetime, FALSE for soft (rekey) lifetime
* @return lifetime in seconds * @return absolute time
*/ */
u_int32_t (*get_lifetime)(child_sa_t *this, bool hard); time_t (*get_lifetime)(child_sa_t *this, bool hard);
/** /**
* Get last use time and the number of bytes processed. * Get last use time and the number of bytes processed.