From: Martin Willi Date: Mon, 2 Jan 2012 13:27:10 +0000 (+0100) Subject: Implemented CHILD_SA rekeying X-Git-Tag: 5.0.0~338^2~9^2~111 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23eb447c9ab518e47f653fa67e80ba60fee6e9bc;p=thirdparty%2Fstrongswan.git Implemented CHILD_SA rekeying --- diff --git a/src/libcharon/sa/ikev1/task_manager_v1.c b/src/libcharon/sa/ikev1/task_manager_v1.c index f388bc8351..ea4cb8a1b4 100644 --- a/src/libcharon/sa/ikev1/task_manager_v1.c +++ b/src/libcharon/sa/ikev1/task_manager_v1.c @@ -1169,7 +1169,24 @@ METHOD(task_manager_t, queue_child, void, METHOD(task_manager_t, queue_child_rekey, void, private_task_manager_t *this, protocol_id_t protocol, u_int32_t spi) { - /* TODO-IKEv1: CHILD rekeying */ + child_sa_t *child_sa; + child_cfg_t *cfg; + quick_mode_t *task; + + child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, spi, TRUE); + if (!child_sa) + { + child_sa = this->ike_sa->get_child_sa(this->ike_sa, protocol, spi, FALSE); + } + if (child_sa && child_sa->get_state(child_sa) == CHILD_INSTALLED) + { + child_sa->set_state(child_sa, CHILD_REKEYING); + cfg = child_sa->get_config(child_sa); + task = quick_mode_create(this->ike_sa, cfg->get_ref(cfg), NULL, NULL); + task->use_reqid(task, child_sa->get_reqid(child_sa)); + + queue_task(this, &task->task); + } } METHOD(task_manager_t, queue_child_delete, void,