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

combined use_in and use_fwd

Browse Source
This commit is contained in:
Andreas Steffen
2007-01-10 08:17:48 +00:00
parent 10984fc905
commit a40926c7eb
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/child_sa.c
+18 -18
View File
@@ -769,7 +769,8 @@ static int print(FILE *stream, const struct printf_info *info,
private_child_sa_t *this = *((private_child_sa_t**)(args[0])); private_child_sa_t *this = *((private_child_sa_t**)(args[0]));
iterator_t *iterator; iterator_t *iterator;
sa_policy_t *policy; sa_policy_t *policy;
u_int32_t now, rekeying, use; u_int32_t now, rekeying;
u_int32_t use, use_in, use_fwd;
status_t status; status_t status;
size_t written = 0; size_t written = 0;
@@ -832,36 +833,35 @@ static int print(FILE *stream, const struct printf_info *info,
written += fprintf(stream, "\n%12s: %R===%R, last use: ", written += fprintf(stream, "\n%12s: %R===%R, last use: ",
this->name, policy->my_ts, policy->other_ts); this->name, policy->my_ts, policy->other_ts);
/* query policy times */ /* query time of last policy use */
/* inbound: POLICY_IN or POLICY_FWD */
status = charon->kernel_interface->query_policy(charon->kernel_interface, status = charon->kernel_interface->query_policy(charon->kernel_interface,
policy->other_ts, policy->my_ts, POLICY_IN, &use); policy->other_ts, policy->my_ts, POLICY_IN, &use_in);
if (status == SUCCESS && use) use_in = (status == SUCCESS)? use_in : 0;
status = charon->kernel_interface->query_policy(charon->kernel_interface,
policy->other_ts, policy->my_ts, POLICY_FWD, &use_fwd);
use_fwd = (status == SUCCESS)? use_fwd : 0;
use = max(use_in, use_fwd);
if (use)
{ {
written += fprintf(stream, "%ds_in ", now - use); written += fprintf(stream, "%ds_i ", now - use);
} }
else else
{ {
written += fprintf(stream, "no_in "); written += fprintf(stream, "no_i ");
} }
/* outbound: POLICY_OUT */
status = charon->kernel_interface->query_policy(charon->kernel_interface, status = charon->kernel_interface->query_policy(charon->kernel_interface,
policy->my_ts, policy->other_ts, POLICY_OUT, &use); policy->my_ts, policy->other_ts, POLICY_OUT, &use);
if (status == SUCCESS && use) if (status == SUCCESS && use)
{ {
written += fprintf(stream, "%ds_out ", now - use); written += fprintf(stream, "%ds_o ", now - use);
} }
else else
{ {
written += fprintf(stream, "no_out "); written += fprintf(stream, "no_o ");
}
status = charon->kernel_interface->query_policy(charon->kernel_interface,
policy->other_ts, policy->my_ts, POLICY_FWD, &use);
if (status == SUCCESS && use)
{
written += fprintf(stream, "%ds_fwd", now - use);
}
else
{
written += fprintf(stream, "no_fwd");
} }
} }
iterator->destroy(iterator); iterator->destroy(iterator);