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

Fixed crash and locking issues while unrouting connections via stroke

Browse Source
This commit is contained in:
Martin Willi
2012-03-13 10:56:22 +01:00
parent cd6b5bf8e9
commit bc403eb1e5
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/stroke/stroke_control.c
+8 -7
View File
@@ -633,8 +633,7 @@ METHOD(stroke_control_t, unroute, void,
{ {
child_sa_t *child_sa; child_sa_t *child_sa;
enumerator_t *enumerator; enumerator_t *enumerator;
u_int32_t id; u_int32_t id = 0;
bool found = FALSE;
if (charon->shunts->uninstall(charon->shunts, msg->unroute.name)) if (charon->shunts->uninstall(charon->shunts, msg->unroute.name))
{ {
@@ -648,15 +647,17 @@ METHOD(stroke_control_t, unroute, void,
if (streq(msg->unroute.name, child_sa->get_name(child_sa))) if (streq(msg->unroute.name, child_sa->get_name(child_sa)))
{ {
id = child_sa->get_reqid(child_sa); id = child_sa->get_reqid(child_sa);
enumerator->destroy(enumerator); break;
charon->traps->uninstall(charon->traps, id);
fprintf(out, "configuration '%s' unrouted\n", msg->unroute.name);
found = TRUE;
} }
} }
enumerator->destroy(enumerator); enumerator->destroy(enumerator);
if (!found) if (id)
{
charon->traps->uninstall(charon->traps, id);
fprintf(out, "configuration '%s' unrouted\n", msg->unroute.name);
}
else
{ {
fprintf(out, "configuration '%s' not found\n", msg->unroute.name); fprintf(out, "configuration '%s' not found\n", msg->unroute.name);
} }