bus: Add new hook called when IKEv1 CHILD_SAs are migrated to a new IKE_SA
The interface is currently not very nice, but if we ever were able to safely checkout multiple SAs concurrently we could add something similar to ike_rekey() and call that when we detect a reauthentication.
This commit is contained in:
+33
-1
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2011-2014 Tobias Brunner
|
* Copyright (C) 2011-2015 Tobias Brunner
|
||||||
* Copyright (C) 2006 Martin Willi
|
* Copyright (C) 2006 Martin Willi
|
||||||
* Hochschule fuer Technik Rapperswil
|
* Hochschule fuer Technik Rapperswil
|
||||||
*
|
*
|
||||||
@@ -687,6 +687,37 @@ METHOD(bus_t, child_rekey, void,
|
|||||||
this->mutex->unlock(this->mutex);
|
this->mutex->unlock(this->mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
METHOD(bus_t, children_migrate, void,
|
||||||
|
private_bus_t *this, ike_sa_id_t *new, u_int32_t unique)
|
||||||
|
{
|
||||||
|
enumerator_t *enumerator;
|
||||||
|
ike_sa_t *ike_sa;
|
||||||
|
entry_t *entry;
|
||||||
|
bool keep;
|
||||||
|
|
||||||
|
ike_sa = this->thread_sa->get(this->thread_sa);
|
||||||
|
|
||||||
|
this->mutex->lock(this->mutex);
|
||||||
|
enumerator = this->listeners->create_enumerator(this->listeners);
|
||||||
|
while (enumerator->enumerate(enumerator, &entry))
|
||||||
|
{
|
||||||
|
if (entry->calling || !entry->listener->children_migrate)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
entry->calling++;
|
||||||
|
keep = entry->listener->children_migrate(entry->listener, ike_sa, new,
|
||||||
|
unique);
|
||||||
|
entry->calling--;
|
||||||
|
if (!keep)
|
||||||
|
{
|
||||||
|
unregister_listener(this, entry, enumerator);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
enumerator->destroy(enumerator);
|
||||||
|
this->mutex->unlock(this->mutex);
|
||||||
|
}
|
||||||
|
|
||||||
METHOD(bus_t, ike_updown, void,
|
METHOD(bus_t, ike_updown, void,
|
||||||
private_bus_t *this, ike_sa_t *ike_sa, bool up)
|
private_bus_t *this, ike_sa_t *ike_sa, bool up)
|
||||||
{
|
{
|
||||||
@@ -1038,6 +1069,7 @@ bus_t *bus_create()
|
|||||||
.ike_reestablish_post = _ike_reestablish_post,
|
.ike_reestablish_post = _ike_reestablish_post,
|
||||||
.child_updown = _child_updown,
|
.child_updown = _child_updown,
|
||||||
.child_rekey = _child_rekey,
|
.child_rekey = _child_rekey,
|
||||||
|
.children_migrate = _children_migrate,
|
||||||
.authorize = _authorize,
|
.authorize = _authorize,
|
||||||
.narrow = _narrow,
|
.narrow = _narrow,
|
||||||
.assign_vips = _assign_vips,
|
.assign_vips = _assign_vips,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2012-2014 Tobias Brunner
|
* Copyright (C) 2012-2015 Tobias Brunner
|
||||||
* Copyright (C) 2006-2009 Martin Willi
|
* Copyright (C) 2006-2009 Martin Willi
|
||||||
* Hochschule fuer Technik Rapperswil
|
* Hochschule fuer Technik Rapperswil
|
||||||
*
|
*
|
||||||
@@ -426,6 +426,14 @@ struct bus_t {
|
|||||||
*/
|
*/
|
||||||
void (*child_rekey)(bus_t *this, child_sa_t *old, child_sa_t *new);
|
void (*child_rekey)(bus_t *this, child_sa_t *old, child_sa_t *new);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* CHILD_SA migration hook.
|
||||||
|
*
|
||||||
|
* @param new ID of new SA when called for the old, NULL otherwise
|
||||||
|
* @param uniue unique ID of new SA when called for the old, 0 otherwise
|
||||||
|
*/
|
||||||
|
void (*children_migrate)(bus_t *this, ike_sa_id_t *new, u_int32_t unique);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Virtual IP assignment hook.
|
* Virtual IP assignment hook.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2011-2014 Tobias Brunner
|
* Copyright (C) 2011-2015 Tobias Brunner
|
||||||
* Copyright (C) 2009 Martin Willi
|
* Copyright (C) 2009 Martin Willi
|
||||||
* Hochschule fuer Technik Rapperswil
|
* Hochschule fuer Technik Rapperswil
|
||||||
*
|
*
|
||||||
@@ -187,6 +187,21 @@ struct listener_t {
|
|||||||
bool (*child_rekey)(listener_t *this, ike_sa_t *ike_sa,
|
bool (*child_rekey)(listener_t *this, ike_sa_t *ike_sa,
|
||||||
child_sa_t *old, child_sa_t *new);
|
child_sa_t *old, child_sa_t *new);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hook called when CHILD_SAs get migrated from one IKE_SA to another during
|
||||||
|
* IKEv1 reauthentication.
|
||||||
|
*
|
||||||
|
* This is called twice, once for the old IKE_SA before the CHILD_SAs are
|
||||||
|
* removed, and once for the new IKE_SA just after they got added.
|
||||||
|
*
|
||||||
|
* @param ike_sa new or old IKE_SA
|
||||||
|
* @param new ID of new SA when called for the old, NULL otherwise
|
||||||
|
* @param unique unique ID of new SA when called for the old, 0 otherwise
|
||||||
|
* @return TRUE to stay registered, FALSE to unregister
|
||||||
|
*/
|
||||||
|
bool (*children_migrate)(listener_t *this, ike_sa_t *ike_sa,
|
||||||
|
ike_sa_id_t *new, u_int32_t unique);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hook called to invoke additional authorization rules.
|
* Hook called to invoke additional authorization rules.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user