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

vici: Remove external enumeration to uninstall shunt policies

Browse Source
This commit is contained in:
Tobias Brunner
2018-02-22 11:31:05 +01:00
parent 9d69d8a399
commit 6f569263a0
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/vici/vici_control.c
+2 -26
View File
@@ -680,11 +680,10 @@ CALLBACK(uninstall, vici_message_t*,
private_vici_control_t *this, char *name, u_int id, vici_message_t *request) private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
{ {
peer_cfg_t *peer_cfg; peer_cfg_t *peer_cfg;
child_cfg_t *child_cfg;
child_sa_t *child_sa; child_sa_t *child_sa;
enumerator_t *enumerator; enumerator_t *enumerator;
uint32_t reqid = 0; uint32_t reqid = 0;
char *child, *ike, *ns; char *child, *ike;
child = request->get_str(request, NULL, "child"); child = request->get_str(request, NULL, "child");
ike = request->get_str(request, NULL, "ike"); ike = request->get_str(request, NULL, "ike");
@@ -695,30 +694,7 @@ CALLBACK(uninstall, vici_message_t*,
DBG1(DBG_CFG, "vici uninstall '%s'", child); DBG1(DBG_CFG, "vici uninstall '%s'", child);
if (!ike) if (charon->shunts->uninstall(charon->shunts, ike, child))
{
enumerator = charon->shunts->create_enumerator(charon->shunts);
while (enumerator->enumerate(enumerator, &ns, &child_cfg))
{
if (ns && streq(child, child_cfg->get_name(child_cfg)))
{
ike = strdup(ns);
break;
}
}
enumerator->destroy(enumerator);
if (ike)
{
if (charon->shunts->uninstall(charon->shunts, ike, child))
{
free(ike);
return send_reply(this, NULL);
}
free(ike);
return send_reply(this, "uninstalling policy '%s' failed", child);
}
}
else if (charon->shunts->uninstall(charon->shunts, ike, child))
{ {
return send_reply(this, NULL); return send_reply(this, NULL);
} }