private_task_manager_t *this, child_cfg_t *cfg, u_int32_t reqid,
traffic_selector_t *tsi, traffic_selector_t *tsr)
{
- queue_task(this, (task_t*)quick_mode_create(this->ike_sa, cfg, tsi, tsr));
+ quick_mode_t *task;
+
+ task = quick_mode_create(this->ike_sa, cfg, tsi, tsr);
+ task->use_reqid(task, reqid);
+
+ queue_task(this, &task->task);
}
METHOD(task_manager_t, queue_child_rekey, void,
*/
u_int64_t lifebytes;
+ /**
+ * Reqid to use, 0 for auto-allocate
+ */
+ u_int32_t reqid;
+
/** states of quick mode */
enum {
QM_INIT,
this->child_sa = child_sa_create(
this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa),
- this->config, 0, udp);
+ this->config, this->reqid, udp);
list = this->config->get_proposals(this->config, FALSE);
this->child_sa = child_sa_create(
this->ike_sa->get_my_host(this->ike_sa),
this->ike_sa->get_other_host(this->ike_sa),
- this->config, 0, udp);
+ this->config, this->reqid, udp);
return NEED_MORE;
}
case QM_NEGOTIATED:
return TASK_QUICK_MODE;
}
+METHOD(quick_mode_t, use_reqid, void,
+ private_quick_mode_t *this, u_int32_t reqid)
+{
+ this->reqid = reqid;
+}
+
METHOD(task_t, migrate, void,
private_quick_mode_t *this, ike_sa_t *ike_sa)
{
.migrate = _migrate,
.destroy = _destroy,
},
+ .use_reqid = _use_reqid,
},
.ike_sa = ike_sa,
.initiator = config != NULL,