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

peer-cfg: Store mediated_by as name and not peer-cfg reference

Browse Source 
This way updates to the mediation config are respected and the order in
which configs are configured/loaded does not matter.

The SQL plugin currently maintains the strong relationship between
mediated and mediation connection (we could theoretically change that to a
string too).
This commit is contained in:
Tobias Brunner
2017-02-16 19:24:09 +01:00
parent ec5f127a45
commit ed96fe72cf
6 changed files with 95 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/initiate_mediation_job.c
+19 -2
View File
@@ -82,8 +82,25 @@ METHOD(job_t, initiate, job_requeue_t,
charon->ike_sa_manager->checkin(charon->ike_sa_manager, mediated_sa);
mediation_cfg = mediated_cfg->get_mediated_by(mediated_cfg);
mediation_cfg->get_ref(mediation_cfg);
mediation_cfg = charon->backends->get_peer_cfg_by_name(charon->backends,
mediated_cfg->get_mediated_by(mediated_cfg));
if (!mediation_cfg)
{
DBG1(DBG_IKE, "mediation connection '%s' not found, aborting",
mediated_cfg->get_mediated_by(mediated_cfg));
mediated_cfg->destroy(mediated_cfg);
return JOB_REQUEUE_NONE;
}
if (!mediation_cfg->is_mediation(mediation_cfg))
{
DBG1(DBG_CFG, "connection '%s' as referred to by '%s' is no "
"mediation connection, aborting",
mediated_cfg->get_mediated_by(mediated_cfg),
mediated_cfg->get_name(mediated_cfg));
mediated_cfg->destroy(mediated_cfg);
mediation_cfg->destroy(mediation_cfg);
return JOB_REQUEUE_NONE;
}
enumerator = mediation_cfg->create_auth_cfg_enumerator(mediation_cfg,
TRUE);