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 7d73bec79ced40ce3c5304718a98ec1a231690b3..f39c3b0e61cfeff16676753ef284d08bd0683425 100644 (file)
--- 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 2e8d41733679113fa7af5516cd4286b66deede88..d0ba1fd2a7e3f503eda031d59ba9174a1a3b9d65 100644 (file)
--- 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 8667e7a9eaed9b12207494011e7489a9221fc75f..db20d052fe8a47468024fb8274183ff3551766dd 100644 (file)
--- 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 801a70738807f0e1036b2018923d9cd4b98365f5..cc8c481c834aca16f737704e1cc2e56c616f1c78 100644 (file)
--- 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.
         */