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

Remove redundant calls to set peer config after checking out IKE_SAs by config

Browse Source
This commit is contained in:
Tobias Brunner
2021-02-12 15:49:08 +01:00
parent c46c40ef24
commit 7f6386afd9
4 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/control/controller.c
+1 -6
View File
@@ -417,10 +417,10 @@ METHOD(job_t, initiate_execute, job_requeue_t,
ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
peer_cfg);
peer_cfg->destroy(peer_cfg);
if (!ike_sa)
{
DESTROY_IF(listener->child_cfg);
peer_cfg->destroy(peer_cfg);
listener->status = FAILED;
listener_done(listener);
return JOB_REQUEUE_NONE;
@@ -429,11 +429,6 @@ METHOD(job_t, initiate_execute, job_requeue_t,
listener->ike_sa = ike_sa;
listener->lock->unlock(listener->lock);
if (ike_sa->get_peer_cfg(ike_sa) == NULL)
{
ike_sa->set_peer_cfg(ike_sa, peer_cfg);
}
peer_cfg->destroy(peer_cfg);
if (listener->options.limits && ike_sa->get_state(ike_sa) == IKE_CREATED)
{ /* only check if we are not reusing an IKE_SA */
src/libcharon/sa/trap_manager.c
+2 -5
View File
@@ -538,12 +538,10 @@ METHOD(trap_manager_t, acquire, void,
ike_sa = charon->ike_sa_manager->checkout_by_config(
charon->ike_sa_manager, peer);
}
peer->destroy(peer);
if (ike_sa)
{
if (ike_sa->get_peer_cfg(ike_sa) == NULL)
{
ike_sa->set_peer_cfg(ike_sa, peer);
}
if (this->ignore_acquire_ts || ike_sa->get_version(ike_sa) == IKEV1)
{ /* in IKEv1, don't prepend the acquiring packet TS, as we only
* have a single TS that we can establish in a Quick Mode. */
@@ -572,7 +570,6 @@ METHOD(trap_manager_t, acquire, void,
destroy_acquire(acquire);
child->destroy(child);
}
peer->destroy(peer);
}
/**