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

Use XAuth/EAP remote identity for uniqueness check

Browse Source
This commit is contained in:
Martin Willi
2012-06-25 10:18:34 +02:00
parent de5e8fb4e0
commit 0fbfcf2a3a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/processing/jobs/adopt_children_job.c
+2 -2
View File
@@ -77,7 +77,7 @@ METHOD(job_t, execute, void,
/* find old SA to adopt children from */ /* find old SA to adopt children from */
children = linked_list_create(); children = linked_list_create();
enumerator = charon->ike_sa_manager->create_id_enumerator( enumerator = charon->ike_sa_manager->create_id_enumerator(
charon->ike_sa_manager, my_id, other_id, charon->ike_sa_manager, my_id, xauth,
other->get_family(other)); other->get_family(other));
while (enumerator->enumerate(enumerator, &id)) while (enumerator->enumerate(enumerator, &id))
{ {
@@ -92,7 +92,7 @@ METHOD(job_t, execute, void,
ike_sa->get_state(ike_sa) == IKE_PASSIVE) && ike_sa->get_state(ike_sa) == IKE_PASSIVE) &&
me->equals(me, ike_sa->get_my_host(ike_sa)) && me->equals(me, ike_sa->get_my_host(ike_sa)) &&
other->equals(other, ike_sa->get_other_host(ike_sa)) && other->equals(other, ike_sa->get_other_host(ike_sa)) &&
xauth->equals(xauth, ike_sa->get_other_eap_id(ike_sa)) && other_id->equals(other_id, ike_sa->get_other_id(ike_sa)) &&
cfg->equals(cfg, ike_sa->get_peer_cfg(ike_sa))) cfg->equals(cfg, ike_sa->get_peer_cfg(ike_sa)))
{ {
childenum = ike_sa->create_child_sa_enumerator(ike_sa); childenum = ike_sa->create_child_sa_enumerator(ike_sa);
src/libcharon/sa/ike_sa_manager.c
+2 -2
View File
@@ -1441,7 +1441,7 @@ METHOD(ike_sa_manager_t, checkin, void,
ike_sa_id = ike_sa->get_id(ike_sa); ike_sa_id = ike_sa->get_id(ike_sa);
my_id = ike_sa->get_my_id(ike_sa); my_id = ike_sa->get_my_id(ike_sa);
other_id = ike_sa->get_other_id(ike_sa); other_id = ike_sa->get_other_eap_id(ike_sa);
other = ike_sa->get_other_host(ike_sa); other = ike_sa->get_other_host(ike_sa);
DBG2(DBG_MGR, "checkin IKE_SA %s[%u]", ike_sa->get_name(ike_sa), DBG2(DBG_MGR, "checkin IKE_SA %s[%u]", ike_sa->get_name(ike_sa),
@@ -1653,7 +1653,7 @@ METHOD(ike_sa_manager_t, check_uniqueness, bool,
return FALSE; return FALSE;
} }
me = ike_sa->get_my_id(ike_sa); me = ike_sa->get_my_id(ike_sa);
other = ike_sa->get_other_id(ike_sa); other = ike_sa->get_other_eap_id(ike_sa);
other_host = ike_sa->get_other_host(ike_sa); other_host = ike_sa->get_other_host(ike_sa);
enumerator = create_id_enumerator(this, me, other, enumerator = create_id_enumerator(this, me, other,
src/libcharon/sa/ike_sa_manager.h
+2
View File
@@ -172,6 +172,8 @@ struct ike_sa_manager_t {
/** /**
* Create an enumerator over ike_sa_id_t*, matching peer identities. * Create an enumerator over ike_sa_id_t*, matching peer identities.
* *
* The remote peer is identified by its XAuth or EAP identity, if available.
*
* @param me local peer identity to match * @param me local peer identity to match
* @param other remote peer identity to match * @param other remote peer identity to match
* @param family address family to match, 0 for any * @param family address family to match, 0 for any