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

stroke: Remove external enumeration to unroute shunt policies

Browse Source
This commit is contained in:
Tobias Brunner
2018-02-22 11:31:05 +01:00
parent 57ea3f73bb
commit 9d69d8a399
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_control.c
+1 -16
View File
@@ -730,30 +730,15 @@ METHOD(stroke_control_t, route, void,
METHOD(stroke_control_t, unroute, void, METHOD(stroke_control_t, unroute, void,
private_stroke_control_t *this, stroke_msg_t *msg, FILE *out) private_stroke_control_t *this, stroke_msg_t *msg, FILE *out)
{ {
child_cfg_t *child_cfg;
child_sa_t *child_sa; child_sa_t *child_sa;
enumerator_t *enumerator; enumerator_t *enumerator;
char *ns, *found = NULL;
uint32_t id = 0; uint32_t id = 0;
enumerator = charon->shunts->create_enumerator(charon->shunts); if (charon->shunts->uninstall(charon->shunts, NULL, msg->unroute.name))
while (enumerator->enumerate(enumerator, &ns, &child_cfg))
{ {
if (ns && streq(msg->unroute.name, child_cfg->get_name(child_cfg)))
{
found = strdup(ns);
break;
}
}
enumerator->destroy(enumerator);
if (found && charon->shunts->uninstall(charon->shunts, found,
msg->unroute.name))
{
free(found);
fprintf(out, "shunt policy '%s' uninstalled\n", msg->unroute.name); fprintf(out, "shunt policy '%s' uninstalled\n", msg->unroute.name);
return; return;
} }
free(found);
enumerator = charon->traps->create_enumerator(charon->traps); enumerator = charon->traps->create_enumerator(charon->traps);
while (enumerator->enumerate(enumerator, NULL, &child_sa)) while (enumerator->enumerate(enumerator, NULL, &child_sa))