From: Martin Willi <martin@revosec.ch>
Date: Thu, 25 Nov 2010 09:55:08 +0000 (+0100)
Subject: Added substructure enumerators to sa_payload, proposal_substructure
X-Git-Tag: 4.5.1~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f2bdd65668a9f47a235916c793d22046a43589;p=thirdparty%2Fstrongswan.git

Added substructure enumerators to sa_payload, proposal_substructure
---

diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c
index 7d73bec79c..f39c3b0e61 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.c
+++ b/src/libcharon/encoding/payloads/proposal_substructure.c
@@ -342,6 +342,12 @@ METHOD(proposal_substructure_t, get_proposal, proposal_t*,
 	return proposal;
 }
 
+METHOD(proposal_substructure_t, create_substructure_enumerator, enumerator_t*,
+	private_proposal_substructure_t *this)
+{
+	return this->transforms->create_enumerator(this->transforms);
+}
+
 METHOD2(payload_t, proposal_substructure_t, destroy, void,
 	private_proposal_substructure_t *this)
 {
@@ -375,6 +381,7 @@ proposal_substructure_t *proposal_substructure_create()
 			.get_protocol_id = _get_protocol_id,
 			.set_is_last_proposal = _set_is_last_proposal,
 			.get_proposal = _get_proposal,
+			.create_substructure_enumerator = _create_substructure_enumerator,
 			.set_spi = _set_spi,
 			.get_spi = _get_spi,
 			.destroy = _destroy,
diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h
index 2e8d417336..d0ba1fd2a7 100644
--- a/src/libcharon/encoding/payloads/proposal_substructure.h
+++ b/src/libcharon/encoding/payloads/proposal_substructure.h
@@ -110,6 +110,13 @@ struct proposal_substructure_t {
 	 */
 	proposal_t * (*get_proposal) (proposal_substructure_t *this);
 
+	/**
+	 * Create an enumerator over transform substructures.
+	 *
+	 * @return			enumerator over transform_substructure_t
+	 */
+	enumerator_t* (*create_substructure_enumerator)(proposal_substructure_t *this);
+
 	/**
 	 * Destroys an proposal_substructure_t object.
 	 */
diff --git a/src/libcharon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c
index 8667e7a9ea..db20d052fe 100644
--- a/src/libcharon/encoding/payloads/sa_payload.c
+++ b/src/libcharon/encoding/payloads/sa_payload.c
@@ -262,6 +262,12 @@ METHOD(sa_payload_t, get_proposals, linked_list_t*,
 	return list;
 }
 
+METHOD(sa_payload_t, create_substructure_enumerator, enumerator_t*,
+	private_sa_payload_t *this)
+{
+	return this->proposals->create_enumerator(this->proposals);
+}
+
 METHOD2(payload_t, sa_payload_t, destroy, void,
 	private_sa_payload_t *this)
 {
@@ -290,6 +296,7 @@ sa_payload_t *sa_payload_create()
 			},
 			.add_proposal = _add_proposal,
 			.get_proposals = _get_proposals,
+			.create_substructure_enumerator = _create_substructure_enumerator,
 			.destroy = _destroy,
 		},
 		.next_payload = NO_PAYLOAD,
diff --git a/src/libcharon/encoding/payloads/sa_payload.h b/src/libcharon/encoding/payloads/sa_payload.h
index 801a707388..cc8c481c83 100644
--- a/src/libcharon/encoding/payloads/sa_payload.h
+++ b/src/libcharon/encoding/payloads/sa_payload.h
@@ -60,6 +60,13 @@ struct sa_payload_t {
 	 */
 	void (*add_proposal) (sa_payload_t *this, proposal_t *proposal);
 
+	/**
+	 * Create an enumerator over all proposal substructures.
+	 *
+	 * @return					enumerator over proposal_substructure_t
+	 */
+	enumerator_t* (*create_substructure_enumerator)(sa_payload_t *this);
+
 	/**
 	 * Destroys an sa_payload_t object.
 	 */