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

avoid DNS lookup if possible

Browse Source
This commit is contained in:
Martin Willi
2008-12-12 10:38:53 +00:00
parent 3993b91334
commit d183adbc9d
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/sa/ike_sa_manager.c
+10 -13
View File
@@ -1031,13 +1031,20 @@ static ike_sa_t* checkout_by_config(private_ike_sa_manager_t *this,
ike_cfg_t *ike_cfg; ike_cfg_t *ike_cfg;
u_int segment; u_int segment;
if (!this->reuse_ikesa)
{ /* IKE_SA reuse disable by config */
ike_sa = checkout_new(this, TRUE);
charon->bus->set_sa(charon->bus, ike_sa);
return ike_sa;
}
ike_cfg = peer_cfg->get_ike_cfg(peer_cfg); ike_cfg = peer_cfg->get_ike_cfg(peer_cfg);
my_id = peer_cfg->get_my_id(peer_cfg); my_id = peer_cfg->get_my_id(peer_cfg);
other_id = peer_cfg->get_other_id(peer_cfg); other_id = peer_cfg->get_other_id(peer_cfg);
my_host = host_create_from_dns(ike_cfg->get_my_addr(ike_cfg), 0, 0); my_host = host_create_from_dns(ike_cfg->get_my_addr(ike_cfg), 0, 0);
other_host = host_create_from_dns(ike_cfg->get_other_addr(ike_cfg), 0, 0); other_host = host_create_from_dns(ike_cfg->get_other_addr(ike_cfg), 0, 0);
if (my_host && other_host && this->reuse_ikesa) if (my_host && other_host)
{ {
enumerator = create_table_enumerator(this); enumerator = create_table_enumerator(this);
while (enumerator->enumerate(enumerator, &entry, &segment)) while (enumerator->enumerate(enumerator, &entry, &segment))
@@ -1097,18 +1104,8 @@ static ike_sa_t* checkout_by_config(private_ike_sa_manager_t *this,
DESTROY_IF(other_host); DESTROY_IF(other_host);
if (!ike_sa) if (!ike_sa)
{ { /* no IKE_SA using such a config, hand out a new */
entry = entry_create(); ike_sa = checkout_new(this, TRUE);
entry->ike_sa_id = ike_sa_id_create(get_next_spi(this), 0, TRUE);
entry->ike_sa = ike_sa_create(entry->ike_sa_id);
segment = put_entry(this, entry);
/* check ike_sa out */
DBG2(DBG_MGR, "new IKE_SA created for IDs [%D]...[%D]", my_id, other_id);
entry->checked_out = TRUE;
ike_sa = entry->ike_sa;
unlock_single_segment(this, segment);
} }
charon->bus->set_sa(charon->bus, ike_sa); charon->bus->set_sa(charon->bus, ike_sa);
return ike_sa; return ike_sa;