diff options
Diffstat (limited to 'Source/charon/encoding/payloads')
6 files changed, 15 insertions, 15 deletions
diff --git a/Source/charon/encoding/payloads/proposal_substructure.c b/Source/charon/encoding/payloads/proposal_substructure.c index 5cdd3b25b..ab575d425 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.c +++ b/Source/charon/encoding/payloads/proposal_substructure.c @@ -221,7 +221,7 @@ static size_t get_length(private_proposal_substructure_t *this) * Implements proposal_substructure_t's create_transform_substructure_iterator function. * See #proposal_substructure_s.create_transform_substructure_iterator for description. */ -static status_t create_transform_substructure_iterator (private_proposal_substructure_t *this,linked_list_iterator_t **iterator,bool forward) +static status_t create_transform_substructure_iterator (private_proposal_substructure_t *this,iterator_t **iterator,bool forward) { return (this->transforms->create_iterator(this->transforms,iterator,forward)); } @@ -333,7 +333,7 @@ static chunk_t get_spi (private_proposal_substructure_t *this) */ static status_t compute_length (private_proposal_substructure_t *this) { - linked_list_iterator_t *iterator; + iterator_t *iterator; status_t status; size_t transforms_count = 0; size_t length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH; @@ -365,7 +365,7 @@ static status_t compute_length (private_proposal_substructure_t *this) static status_t clone(private_proposal_substructure_t *this, private_proposal_substructure_t **clone) { private_proposal_substructure_t * new_clone; - linked_list_iterator_t *transforms; + iterator_t *transforms; status_t status; new_clone = (private_proposal_substructure_t *) proposal_substructure_create(); @@ -477,7 +477,7 @@ proposal_substructure_t *proposal_substructure_create() this->public.payload_interface.destroy = (status_t (*) (payload_t *))destroy; /* public functions */ - this->public.create_transform_substructure_iterator = (status_t (*) (proposal_substructure_t *,linked_list_iterator_t **,bool)) create_transform_substructure_iterator; + this->public.create_transform_substructure_iterator = (status_t (*) (proposal_substructure_t *,iterator_t **,bool)) create_transform_substructure_iterator; this->public.add_transform_substructure = (status_t (*) (proposal_substructure_t *,transform_substructure_t *)) add_transform_substructure; this->public.set_proposal_number = (status_t (*) (proposal_substructure_t *,u_int8_t))set_proposal_number; this->public.get_proposal_number = (u_int8_t (*) (proposal_substructure_t *)) get_proposal_number; diff --git a/Source/charon/encoding/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h index 134c4776e..d6f90e403 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.h +++ b/Source/charon/encoding/payloads/proposal_substructure.h @@ -77,7 +77,7 @@ struct proposal_substructure_t { * - SUCCESS or * - OUT_OF_RES if iterator could not be created */ - status_t (*create_transform_substructure_iterator) (proposal_substructure_t *this,linked_list_iterator_t **iterator, bool forward); + status_t (*create_transform_substructure_iterator) (proposal_substructure_t *this,iterator_t **iterator, bool forward); /** * @brief Adds a transform_substructure_t object to this object. diff --git a/Source/charon/encoding/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c index 7a8b71452..c760dc3a2 100644 --- a/Source/charon/encoding/payloads/sa_payload.c +++ b/Source/charon/encoding/payloads/sa_payload.c @@ -122,7 +122,7 @@ static status_t verify(private_sa_payload_t *this) { int proposal_number = 1; status_t status; - linked_list_iterator_t *iterator; + iterator_t *iterator; bool first = TRUE; if (this->critical) @@ -253,7 +253,7 @@ static size_t get_length(private_sa_payload_t *this) * Implements sa_payload_t's create_proposal_substructure_iterator function. * See #sa_payload_s.create_proposal_substructure_iterator for description. */ -static status_t create_proposal_substructure_iterator (private_sa_payload_t *this,linked_list_iterator_t **iterator,bool forward) +static status_t create_proposal_substructure_iterator (private_sa_payload_t *this,iterator_t **iterator,bool forward) { return (this->proposals->create_iterator(this->proposals,iterator,forward)); } @@ -276,7 +276,7 @@ static status_t add_proposal_substructure (private_sa_payload_t *this,proposal_s */ static status_t compute_length (private_sa_payload_t *this) { - linked_list_iterator_t *iterator; + iterator_t *iterator; status_t status; size_t length = SA_PAYLOAD_HEADER_LENGTH; status = this->proposals->create_iterator(this->proposals,&iterator,TRUE); @@ -318,7 +318,7 @@ sa_payload_t *sa_payload_create() this->public.payload_interface.destroy = (status_t (*) (payload_t *))destroy; /* public functions */ - this->public.create_proposal_substructure_iterator = (status_t (*) (sa_payload_t *,linked_list_iterator_t **,bool)) create_proposal_substructure_iterator; + this->public.create_proposal_substructure_iterator = (status_t (*) (sa_payload_t *,iterator_t **,bool)) create_proposal_substructure_iterator; this->public.add_proposal_substructure = (status_t (*) (sa_payload_t *,proposal_substructure_t *)) add_proposal_substructure; this->public.destroy = (status_t (*) (sa_payload_t *)) destroy; diff --git a/Source/charon/encoding/payloads/sa_payload.h b/Source/charon/encoding/payloads/sa_payload.h index 2f882d0d8..7eada847c 100644 --- a/Source/charon/encoding/payloads/sa_payload.h +++ b/Source/charon/encoding/payloads/sa_payload.h @@ -71,7 +71,7 @@ struct sa_payload_t { * - SUCCESS or * - OUT_OF_RES if iterator could not be created */ - status_t (*create_proposal_substructure_iterator) (sa_payload_t *this,linked_list_iterator_t **iterator, bool forward); + status_t (*create_proposal_substructure_iterator) (sa_payload_t *this,iterator_t **iterator, bool forward); /** * @brief Adds a proposal_substructure_t object to this object. diff --git a/Source/charon/encoding/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c index 0d931c984..e81aae57e 100644 --- a/Source/charon/encoding/payloads/transform_substructure.c +++ b/Source/charon/encoding/payloads/transform_substructure.c @@ -334,7 +334,7 @@ static size_t get_length(private_transform_substructure_t *this) * Implements transform_substructure_t's create_transform_attribute_iterator function. * See #transform_substructure_s.create_transform_attribute_iterator for description. */ -static status_t create_transform_attribute_iterator (private_transform_substructure_t *this,linked_list_iterator_t **iterator,bool forward) +static status_t create_transform_attribute_iterator (private_transform_substructure_t *this,iterator_t **iterator,bool forward) { return (this->attributes->create_iterator(this->attributes,iterator,forward)); } @@ -423,7 +423,7 @@ static u_int16_t get_transform_id (private_transform_substructure_t *this) */ static status_t compute_length (private_transform_substructure_t *this) { - linked_list_iterator_t *iterator; + iterator_t *iterator; status_t status; size_t length = TRANSFORM_SUBSTRUCTURE_HEADER_LENGTH; status = this->attributes->create_iterator(this->attributes,&iterator,TRUE); @@ -451,7 +451,7 @@ static status_t compute_length (private_transform_substructure_t *this) static status_t clone(private_transform_substructure_t *this,transform_substructure_t **clone) { private_transform_substructure_t *new_clone; - linked_list_iterator_t *attributes; + iterator_t *attributes; status_t status; new_clone = (private_transform_substructure_t *) transform_substructure_create(); @@ -547,7 +547,7 @@ transform_substructure_t *transform_substructure_create() this->public.payload_interface.destroy = (status_t (*) (payload_t *))destroy; /* public functions */ - this->public.create_transform_attribute_iterator = (status_t (*) (transform_substructure_t *,linked_list_iterator_t **,bool)) create_transform_attribute_iterator; + this->public.create_transform_attribute_iterator = (status_t (*) (transform_substructure_t *,iterator_t **,bool)) create_transform_attribute_iterator; this->public.add_transform_attribute = (status_t (*) (transform_substructure_t *,transform_attribute_t *)) add_transform_attribute; this->public.set_is_last_transform = (status_t (*) (transform_substructure_t *,bool)) set_is_last_transform; this->public.get_is_last_transform = (bool (*) (transform_substructure_t *)) get_is_last_transform; diff --git a/Source/charon/encoding/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h index 9cd94775b..e4b503ab9 100644 --- a/Source/charon/encoding/payloads/transform_substructure.h +++ b/Source/charon/encoding/payloads/transform_substructure.h @@ -194,7 +194,7 @@ struct transform_substructure_t { * - SUCCESS or * - OUT_OF_RES if iterator could not be created */ - status_t (*create_transform_attribute_iterator) (transform_substructure_t *this,linked_list_iterator_t **iterator, bool forward); + status_t (*create_transform_attribute_iterator) (transform_substructure_t *this,iterator_t **iterator, bool forward); /** * @brief Adds a transform_attribute_t object to this object. |