From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 24 Mar 2025 14:53:19 +0000 (+0100)
Subject: acquire-job: Use helpers to manage acquire data
X-Git-Tag: 6.0.2dr1~6^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65b810e9b0edaebd290c0b119392071cd81b4d12;p=thirdparty%2Fstrongswan.git

acquire-job: Use helpers to manage acquire data
---

diff --git a/src/libcharon/processing/jobs/acquire_job.c b/src/libcharon/processing/jobs/acquire_job.c
index 8b04f11a4b..33f6ae213a 100644
--- a/src/libcharon/processing/jobs/acquire_job.c
+++ b/src/libcharon/processing/jobs/acquire_job.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2022-2025 Tobias Brunner
  * Copyright (C) 2006-2009 Martin Willi
  *
  * Copyright (C) secunet Security Networks AG
@@ -38,22 +39,20 @@ struct private_acquire_job_t {
 	/**
 	 * Data from the acquire
 	 */
-	kernel_acquire_data_t data;
+	kernel_acquire_data_t *data;
 };
 
 METHOD(job_t, destroy, void,
 	private_acquire_job_t *this)
 {
-	DESTROY_IF(this->data.src);
-	DESTROY_IF(this->data.dst);
-	DESTROY_IF(this->data.label);
+	kernel_acquire_data_destroy(this->data);
 	free(this);
 }
 
 METHOD(job_t, execute, job_requeue_t,
 	private_acquire_job_t *this)
 {
-	charon->traps->acquire(charon->traps, this->reqid, &this->data);
+	charon->traps->acquire(charon->traps, this->reqid, this->data);
 	return JOB_REQUEUE_NONE;
 }
 
@@ -79,21 +78,8 @@ acquire_job_t *acquire_job_create(uint32_t reqid, kernel_acquire_data_t *data)
 			},
 		},
 		.reqid = reqid,
-		.data = *data,
+		.data = kernel_acquire_data_clone(data),
 	);
 
-	if (this->data.src)
-	{
-		this->data.src = this->data.src->clone(this->data.src);
-	}
-	if (this->data.dst)
-	{
-		this->data.dst = this->data.dst->clone(this->data.dst);
-	}
-	if (this->data.label)
-	{
-		this->data.label = this->data.label->clone(this->data.label);
-	}
-
 	return &this->public;
 }