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

update usetime only if usebytes increase

Browse Source
This commit is contained in:
Andreas Steffen
2009-07-30 23:19:42 +02:00
parent 2ad51539f6
commit 3f720dc7c3
4 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/stroke/stroke_list.c
+6 -4
View File
@@ -175,6 +175,8 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
if (all)
{
bool change;
fprintf(out, "\n%12s{%d}: ", child_sa->get_name(child_sa),
child_sa->get_reqid(child_sa));
@@ -207,22 +209,22 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
}
}
bytes_in = child_sa->get_usebytes(child_sa, TRUE);
bytes_in = child_sa->get_usebytes(child_sa, TRUE, &change);
fprintf(out, ", %lu bytes_i", bytes_in);
if (bytes_in)
{
use_in = child_sa->get_usetime(child_sa, TRUE);
use_in = child_sa->get_usetime(child_sa, TRUE, change);
if (use_in)
{
fprintf(out, " (%ds ago)", now - use_in);
}
}
bytes_out = child_sa->get_usebytes(child_sa, FALSE);
bytes_out = child_sa->get_usebytes(child_sa, FALSE, &change);
fprintf(out, ", %lu bytes_o", bytes_out);
if (bytes_out)
{
use_out = child_sa->get_usetime(child_sa, FALSE);
use_out = child_sa->get_usetime(child_sa, FALSE, change);
if (use_out)
{
fprintf(out, " (%ds ago)", now - use_out);
src/charon/sa/child_sa.c
+56 -5
View File
@@ -136,6 +136,26 @@ struct private_child_sa_t {
* config used to create this child
*/
child_cfg_t *config;
/**
* time of last use in seconds (inbound)
*/
u_int32_t my_usetime;
/**
* time of last use in seconds (outbound)
*/
u_int32_t other_usetime;
/**
* last number of inbound bytes
*/
u_int64_t my_usebytes;
/**
* last number of outbound bytes
*/
u_int64_t other_usebytes;
};
/**
@@ -357,12 +377,17 @@ static enumerator_t* create_policy_enumerator(private_child_sa_t *this)
/**
* Implementation of child_sa_t.get_usetime
*/
static u_int32_t get_usetime(private_child_sa_t *this, bool inbound)
static u_int32_t get_usetime(private_child_sa_t *this, bool inbound, bool update)
{
enumerator_t *enumerator;
traffic_selector_t *my_ts, *other_ts;
u_int32_t last_use = 0;
if (!update)
{
return (inbound) ? this->my_usetime : this->other_usetime;
}
enumerator = create_policy_enumerator(this);
while (enumerator->enumerate(enumerator, &my_ts, &other_ts))
{
@@ -394,17 +419,26 @@ static u_int32_t get_usetime(private_child_sa_t *this, bool inbound)
}
}
enumerator->destroy(enumerator);
if (inbound)
{
this->my_usetime = last_use;
}
else
{
this->other_usetime = last_use;
}
return last_use;
}
/**
* Implementation of child_sa_t.get_usebytes
*/
static u_int64_t get_usebytes(private_child_sa_t *this, bool inbound)
static u_int64_t get_usebytes(private_child_sa_t *this, bool inbound, bool *change)
{
status_t status = NOT_SUPPORTED;
status_t status;
u_int64_t bytes;
*change = FALSE;
if (inbound)
{
if (this->my_spi)
@@ -412,7 +446,14 @@ static u_int64_t get_usebytes(private_child_sa_t *this, bool inbound)
status = charon->kernel_interface->query_sa(charon->kernel_interface,
this->other_addr, this->my_addr,
this->my_spi, this->protocol, &bytes);
if (status == SUCCESS && bytes > this->my_usebytes)
{
*change = TRUE;
this->my_usebytes = bytes;
return bytes;
}
}
return this->my_usebytes;
}
else
{
@@ -421,9 +462,15 @@ static u_int64_t get_usebytes(private_child_sa_t *this, bool inbound)
status = charon->kernel_interface->query_sa(charon->kernel_interface,
this->my_addr, this->other_addr,
this->other_spi, this->protocol, &bytes);
if (status == SUCCESS && bytes > this->other_usebytes)
{
*change = TRUE;
this->other_usebytes = bytes;
return bytes;
}
}
return this->other_usebytes;
}
return (status == SUCCESS) ? bytes : 0;
}
/**
@@ -805,7 +852,7 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
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_usetime = (u_int32_t(*)(child_sa_t*, bool))get_usetime;
this->public.get_usebytes = (u_int64_t(*)(child_sa_t*, bool))get_usebytes;
this->public.get_usebytes = (u_int64_t(*)(child_sa_t*, bool, bool*))get_usebytes;
this->public.has_encap = (bool(*)(child_sa_t*))has_encap;
this->public.get_ipcomp = (ipcomp_transform_t(*)(child_sa_t*))get_ipcomp;
this->public.set_ipcomp = (void(*)(child_sa_t*,ipcomp_transform_t))set_ipcomp;
@@ -828,6 +875,10 @@ child_sa_t * child_sa_create(host_t *me, host_t* other,
this->encap = encap;
this->ipcomp = IPCOMP_NONE;
this->state = CHILD_CREATED;
this->my_usetime = 0;
this->other_usetime = 0;
this->my_usebytes = 0;
this->other_usebytes = 0;
/* reuse old reqid if we are rekeying an existing CHILD_SA */
this->reqid = rekey ? rekey : ++reqid;
this->my_ts = linked_list_create();
src/charon/sa/child_sa.h
+6 -4
View File
@@ -240,17 +240,19 @@ struct child_sa_t {
* Get last use time of the CHILD_SA.
*
* @param inbound TRUE for inbound traffic, FALSE for outbound
* @param update update time of last use via kernel query
* @return time of last use in seconds
*/
u_int32_t (*get_usetime)(child_sa_t *this, bool inbound);
u_int32_t (*get_usetime)(child_sa_t *this, bool inbound, bool update);
/**
* Get number of bytes processed by CHILD_SA.
*
* @param inbound TRUE for inbound traffic, FALSE for outbound
* @return number of processed bytes
* @param inbound TRUE for inbound traffic, FALSE for outbound
* @param[out] change TRUE if change since last query, FALSE else
* @return number of processed bytes
*/
u_int64_t (*get_usebytes)(child_sa_t *this, bool inbound);
u_int64_t (*get_usebytes)(child_sa_t *this, bool inbound, bool *change);
/**
* Get the traffic selectors list added for one side.
src/charon/sa/ike_sa.c
+5 -1
View File
@@ -273,7 +273,11 @@ static time_t get_use_time(private_ike_sa_t* this, bool inbound)
enumerator = this->child_sas->create_enumerator(this->child_sas);
while (enumerator->enumerate(enumerator, &child_sa))
{
use_time = max(use_time, child_sa->get_usetime(child_sa, inbound));
u_int64_t use_bytes;
bool change;
use_bytes = child_sa->get_usebytes(child_sa, inbound, &change);
use_time = max(use_time, child_sa->get_usetime(child_sa, inbound, change));
}
enumerator->destroy(enumerator);