Commit 5aacf5c7b6 for strongswan.org
commit 5aacf5c7b617189671c4456b562c7a7fddba9168
Author: Jean-François Hren <jean-francois.hren@stormshield.eu>
Date: Mon Jan 5 09:50:53 2026 +0100
trap-manager: Use latest seq when creating an acquire entry
Closes strongswan/strongswan#2975
Fixes: 79815b4e675a ("trap-manager: Set seq. no. for CHILD_SAs not initiated by an acquire")
diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
index 655db91fdf..5789b3cc37 100644
--- a/src/libcharon/sa/trap_manager.c
+++ b/src/libcharon/sa/trap_manager.c
@@ -579,12 +579,12 @@ METHOD(trap_manager_t, acquire, void,
}
if (!acquire)
{
+ seq = data->seq = data->seq ?: ref_get_nonzero(&this->acquire_seq);
INIT(acquire,
.dst = host,
.reqid = reqid,
.data = kernel_acquire_data_clone(data),
);
- seq = data->seq = data->seq ?: ref_get_nonzero(&this->acquire_seq);
this->acquires->insert_last(this->acquires, acquire);
}
else if (data->seq && data->seq != acquire->data->seq)