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

improved selection of ipsec status|statusall <name>

Browse Source
This commit is contained in:
Andreas Steffen
2006-11-02 18:30:50 +00:00
parent 03bf883d95
commit 1183f8ac82
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/threads/stroke_interface.c
+30 -10
View File
@@ -717,17 +717,27 @@ static void stroke_statusall(private_stroke_t *this, stroke_msg_t *msg)
child_sa_t *child_sa; child_sa_t *child_sa;
iterator_t *children = ike_sa->create_child_sa_iterator(ike_sa); iterator_t *children = ike_sa->create_child_sa_iterator(ike_sa);
/* print IKE_SA */
if (name == NULL || strncmp(name, ike_sa->get_name(ike_sa), strlen(name)) == 0)
{
fprintf(this->out, "%#K\n", ike_sa);
ike_sa_printed = TRUE;
}
while (children->iterate(children, (void**)&child_sa)) while (children->iterate(children, (void**)&child_sa))
{ {
if (!ike_sa_printed bool child_sa_match = name == NULL ||
&& (name == NULL || strncmp(name, child_sa->get_name(child_sa), strlen(name)) == 0;
strncmp(name, child_sa->get_name(child_sa), strlen(name)) == 0 ||
strncmp(name, ike_sa->get_name(ike_sa), strlen(name)) == 0)) /* print IKE_SA if its name differs from the CHILD_SA's name */
if (!ike_sa_printed && child_sa_match)
{ {
fprintf(this->out, "%#K\n", ike_sa); fprintf(this->out, "%#K\n", ike_sa);
ike_sa_printed = TRUE; ike_sa_printed = TRUE;
} }
if (ike_sa_printed)
/* print CHILD_SA */
if (child_sa_match)
{ {
fprintf(this->out, "%#P\n", child_sa); fprintf(this->out, "%#P\n", child_sa);
} }
@@ -759,17 +769,27 @@ static void stroke_status(private_stroke_t *this, stroke_msg_t *msg)
child_sa_t *child_sa; child_sa_t *child_sa;
iterator_t *children = ike_sa->create_child_sa_iterator(ike_sa); iterator_t *children = ike_sa->create_child_sa_iterator(ike_sa);
/* print IKE_SA */
if (name == NULL || strncmp(name, ike_sa->get_name(ike_sa), strlen(name)) == 0)
{
fprintf(this->out, "%K\n", ike_sa);
ike_sa_printed = TRUE;
}
while (children->iterate(children, (void**)&child_sa)) while (children->iterate(children, (void**)&child_sa))
{ {
if (!ike_sa_printed bool child_sa_match = name == NULL ||
&& (name == NULL || strncmp(name, child_sa->get_name(child_sa), strlen(name)) == 0;
strncmp(name, child_sa->get_name(child_sa), strlen(name)) == 0 ||
strncmp(name, ike_sa->get_name(ike_sa), strlen(name)) == 0)) /* print IKE_SA if its name differs from the CHILD_SA's name */
if (!ike_sa_printed && child_sa_match)
{ {
fprintf(this->out, "%K\n", ike_sa); fprintf(this->out, "%K\n", ike_sa);
ike_sa_printed = TRUE; ike_sa_printed = TRUE;
} }
if (ike_sa_printed)
/* print CHILD_SA */
if (child_sa_match)
{ {
fprintf(this->out, "%P\n", child_sa); fprintf(this->out, "%P\n", child_sa);
} }