diff options
Diffstat (limited to 'Source/charon/encoding/payloads')
10 files changed, 49 insertions, 48 deletions
diff --git a/Source/charon/encoding/payloads/encryption_payload.c b/Source/charon/encoding/payloads/encryption_payload.c index 6bef3bf1b..08722f83f 100644 --- a/Source/charon/encoding/payloads/encryption_payload.c +++ b/Source/charon/encoding/payloads/encryption_payload.c @@ -287,9 +287,9 @@ static size_t get_length(private_encryption_payload_t *this) /** * Implementation of payload_t.create_payload_iterator. */ -static void create_payload_iterator (private_encryption_payload_t *this, iterator_t **iterator, bool forward) +static iterator_t *create_payload_iterator (private_encryption_payload_t *this, bool forward) { - this->payloads->create_iterator(this->payloads, iterator, forward); + return (this->payloads->create_iterator(this->payloads, forward)); } /** @@ -506,7 +506,7 @@ static void generate(private_encryption_payload_t *this) iterator_t *iterator; /* create iterator */ - this->payloads->create_iterator(this->payloads, &iterator, TRUE); + iterator = this->payloads->create_iterator(this->payloads, TRUE); /* get first payload */ if (iterator->has_next(iterator)) @@ -598,7 +598,7 @@ static void compute_length(private_encryption_payload_t *this) { iterator_t *iterator; size_t length = ENCRYPTION_PAYLOAD_HEADER_LENGTH; - this->payloads->create_iterator(this->payloads, &iterator, TRUE); + iterator = this->payloads->create_iterator(this->payloads, TRUE); while (iterator->has_next(iterator)) { @@ -629,7 +629,7 @@ encryption_payload_t *encryption_payload_create() this->public.payload_interface.destroy = (void (*) (payload_t *))destroy; /* public functions */ - this->public.create_payload_iterator = (void (*) (encryption_payload_t *,iterator_t **,bool)) create_payload_iterator; + this->public.create_payload_iterator = (iterator_t * (*) (encryption_payload_t *,bool)) create_payload_iterator; this->public.add_payload = (void (*) (encryption_payload_t *,payload_t *)) add_payload; this->public.encrypt = (status_t (*) (encryption_payload_t *, crypter_t*)) encrypt; this->public.decrypt = (status_t (*) (encryption_payload_t *, crypter_t*)) decrypt; diff --git a/Source/charon/encoding/payloads/encryption_payload.h b/Source/charon/encoding/payloads/encryption_payload.h index 398adbaee..caf7e6b06 100644 --- a/Source/charon/encoding/payloads/encryption_payload.h +++ b/Source/charon/encoding/payloads/encryption_payload.h @@ -49,12 +49,14 @@ struct encryption_payload_t { /** * @brief Creates an iterator for all contained payloads. + * + * @warning iterator_t object has to get destroyed by the caller. * * @param this calling encryption_payload_t object - * @param iterator the created iterator is stored at the pointed pointer * @param[in] forward iterator direction (TRUE: front to end) + * return created iterator_t object */ - void (*create_payload_iterator) (encryption_payload_t *this, iterator_t **iterator, bool forward); + iterator_t *(*create_payload_iterator) (encryption_payload_t *this, bool forward); /** * @brief Adds a payload to this encryption payload. diff --git a/Source/charon/encoding/payloads/proposal_substructure.c b/Source/charon/encoding/payloads/proposal_substructure.c index 765fd1d0d..c80880d77 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.c +++ b/Source/charon/encoding/payloads/proposal_substructure.c @@ -205,9 +205,9 @@ static size_t get_length(private_proposal_substructure_t *this) /** * Implementation of proposal_substructure_t.create_transform_substructure_iterator. */ -static void create_transform_substructure_iterator (private_proposal_substructure_t *this,iterator_t **iterator,bool forward) +static iterator_t *create_transform_substructure_iterator (private_proposal_substructure_t *this,bool forward) { - this->transforms->create_iterator(this->transforms,iterator,forward); + return (this->transforms->create_iterator(this->transforms,forward)); } /** @@ -304,7 +304,7 @@ static status_t get_info_for_transform_type (private_proposal_substructure_t *th u_int16_t found_transform_id; u_int16_t found_key_length; - this->transforms->create_iterator(this->transforms,&iterator,TRUE); + iterator = this->transforms->create_iterator(this->transforms,TRUE); while (iterator->has_next(iterator)) { @@ -337,7 +337,7 @@ static void compute_length (private_proposal_substructure_t *this) iterator_t *iterator; size_t transforms_count = 0; size_t length = PROPOSAL_SUBSTRUCTURE_HEADER_LENGTH; - this->transforms->create_iterator(this->transforms,&iterator,TRUE); + iterator = this->transforms->create_iterator(this->transforms,TRUE); while (iterator->has_next(iterator)) { payload_t * current_transform; @@ -356,7 +356,7 @@ static void compute_length (private_proposal_substructure_t *this) /** * Implementation of proposal_substructure_t.clone. */ -static void clone(private_proposal_substructure_t *this, private_proposal_substructure_t **clone) +static private_proposal_substructure_t* clone(private_proposal_substructure_t *this) { private_proposal_substructure_t * new_clone; iterator_t *transforms; @@ -373,7 +373,7 @@ static void clone(private_proposal_substructure_t *this, private_proposal_substr new_clone->spi.len = this->spi.len; } - this->transforms->create_iterator(this->transforms,&transforms,FALSE); + transforms = this->transforms->create_iterator(this->transforms,FALSE); while (transforms->has_next(transforms)) { @@ -382,14 +382,14 @@ static void clone(private_proposal_substructure_t *this, private_proposal_substr transforms->current(transforms,(void **) ¤t_transform); - current_transform->clone(current_transform,¤t_transform_clone); + current_transform_clone = current_transform->clone(current_transform); new_clone->public.add_transform_substructure(&(new_clone->public),current_transform_clone); } transforms->destroy(transforms); - *clone = new_clone; + return new_clone; } /** @@ -437,7 +437,7 @@ proposal_substructure_t *proposal_substructure_create() this->public.payload_interface.destroy = (void (*) (payload_t *))destroy; /* public functions */ - this->public.create_transform_substructure_iterator = (void (*) (proposal_substructure_t *,iterator_t **,bool)) create_transform_substructure_iterator; + this->public.create_transform_substructure_iterator = (iterator_t* (*) (proposal_substructure_t *,bool)) create_transform_substructure_iterator; this->public.add_transform_substructure = (void (*) (proposal_substructure_t *,transform_substructure_t *)) add_transform_substructure; this->public.set_proposal_number = (void (*) (proposal_substructure_t *,u_int8_t))set_proposal_number; this->public.get_proposal_number = (u_int8_t (*) (proposal_substructure_t *)) get_proposal_number; @@ -446,7 +446,7 @@ proposal_substructure_t *proposal_substructure_create() this->public.get_info_for_transform_type = (status_t (*) (proposal_substructure_t *,transform_type_t,u_int16_t *, u_int16_t *))get_info_for_transform_type; this->public.set_spi = (void (*) (proposal_substructure_t *,chunk_t))set_spi; this->public.get_spi = (chunk_t (*) (proposal_substructure_t *)) get_spi; - this->public.clone = (void (*) (proposal_substructure_t *, proposal_substructure_t **)) clone; + this->public.clone = (proposal_substructure_t * (*) (proposal_substructure_t *)) clone; this->public.destroy = (void (*) (proposal_substructure_t *)) destroy; diff --git a/Source/charon/encoding/payloads/proposal_substructure.h b/Source/charon/encoding/payloads/proposal_substructure.h index d92a92c0e..f131cf74c 100644 --- a/Source/charon/encoding/payloads/proposal_substructure.h +++ b/Source/charon/encoding/payloads/proposal_substructure.h @@ -74,10 +74,10 @@ struct proposal_substructure_t { * get_size to make sure the length and number values are ok. * * @param this calling proposal_substructure_t object - * @param iterator the created iterator is stored at the pointed pointer * @param[in] forward iterator direction (TRUE: front to end) + * @return created iterator_t object */ - void (*create_transform_substructure_iterator) (proposal_substructure_t *this,iterator_t **iterator, bool forward); + iterator_t * (*create_transform_substructure_iterator) (proposal_substructure_t *this, bool forward); /** * @brief Adds a transform_substructure_t object to this object. @@ -161,9 +161,9 @@ struct proposal_substructure_t { * @brief Clones an proposal_substructure_t object. * * @param this proposal_substructure_t object to clone - * @param clone cloned object will be written there + * @return cloned object */ - void (*clone) (proposal_substructure_t *this,proposal_substructure_t **clone); + proposal_substructure_t* (*clone) (proposal_substructure_t *this); /** * @brief Destroys an proposal_substructure_t object. diff --git a/Source/charon/encoding/payloads/sa_payload.c b/Source/charon/encoding/payloads/sa_payload.c index 92e08a042..d9175de60 100644 --- a/Source/charon/encoding/payloads/sa_payload.c +++ b/Source/charon/encoding/payloads/sa_payload.c @@ -126,7 +126,7 @@ static status_t verify(private_sa_payload_t *this) } /* check proposal numbering */ - this->proposals->create_iterator(this->proposals,&iterator,TRUE); + iterator = this->proposals->create_iterator(this->proposals,TRUE); while(iterator->has_next(iterator)) { @@ -230,9 +230,9 @@ static size_t get_length(private_sa_payload_t *this) /** * Implementation of sa_payload_t.create_proposal_substructure_iterator. */ -static void create_proposal_substructure_iterator (private_sa_payload_t *this,iterator_t **iterator,bool forward) +static iterator_t *create_proposal_substructure_iterator (private_sa_payload_t *this,bool forward) { - this->proposals->create_iterator(this->proposals,iterator,forward); + return this->proposals->create_iterator(this->proposals,forward); } /** @@ -251,7 +251,7 @@ static void compute_length (private_sa_payload_t *this) { iterator_t *iterator; size_t length = SA_PAYLOAD_HEADER_LENGTH; - this->proposals->create_iterator(this->proposals,&iterator,TRUE); + iterator = this->proposals->create_iterator(this->proposals,TRUE); while (iterator->has_next(iterator)) { payload_t *current_proposal; @@ -280,7 +280,7 @@ sa_payload_t *sa_payload_create() this->public.payload_interface.destroy = (void (*) (payload_t *))destroy; /* public functions */ - this->public.create_proposal_substructure_iterator = (void (*) (sa_payload_t *,iterator_t **,bool)) create_proposal_substructure_iterator; + this->public.create_proposal_substructure_iterator = (iterator_t* (*) (sa_payload_t *,bool)) create_proposal_substructure_iterator; this->public.add_proposal_substructure = (void (*) (sa_payload_t *,proposal_substructure_t *)) add_proposal_substructure; this->public.destroy = (void (*) (sa_payload_t *)) destroy; diff --git a/Source/charon/encoding/payloads/sa_payload.h b/Source/charon/encoding/payloads/sa_payload.h index 5e5d94550..dbd0bd1c3 100644 --- a/Source/charon/encoding/payloads/sa_payload.h +++ b/Source/charon/encoding/payloads/sa_payload.h @@ -67,10 +67,10 @@ struct sa_payload_t { * by calling get_length()! * * @param this calling sa_payload_t object - * @param iterator the created iterator is stored at the pointed pointer * @param[in] forward iterator direction (TRUE: front to end) + * @return created iterator_t object */ - void (*create_proposal_substructure_iterator) (sa_payload_t *this,iterator_t **iterator, bool forward); + iterator_t *(*create_proposal_substructure_iterator) (sa_payload_t *this, bool forward); /** * @brief Adds a proposal_substructure_t object to this object. diff --git a/Source/charon/encoding/payloads/transform_attribute.c b/Source/charon/encoding/payloads/transform_attribute.c index 40f06bd8c..c85895fc6 100644 --- a/Source/charon/encoding/payloads/transform_attribute.c +++ b/Source/charon/encoding/payloads/transform_attribute.c @@ -255,7 +255,7 @@ static u_int16_t get_attribute_type (private_transform_attribute_t *this) /** * Implementation of transform_attribute_t.clone. */ -static void clone(private_transform_attribute_t *this,transform_attribute_t **clone) +static transform_attribute_t * clone(private_transform_attribute_t *this) { private_transform_attribute_t *new_clone; @@ -271,7 +271,7 @@ static void clone(private_transform_attribute_t *this,transform_attribute_t **cl new_clone->attribute_value.len = this->attribute_value.len; } - *clone = (transform_attribute_t *) new_clone; + return (transform_attribute_t *) new_clone; } /** @@ -309,7 +309,7 @@ transform_attribute_t *transform_attribute_create() this->public.get_value = (u_int16_t (*) (transform_attribute_t *)) get_value; this->public.set_attribute_type = (void (*) (transform_attribute_t *,u_int16_t type)) set_attribute_type; this->public.get_attribute_type = (u_int16_t (*) (transform_attribute_t *)) get_attribute_type; - this->public.clone = (void (*) (transform_attribute_t *,transform_attribute_t **)) clone; + this->public.clone = (transform_attribute_t * (*) (transform_attribute_t *)) clone; this->public.destroy = (void (*) (transform_attribute_t *)) destroy; /* set default values of the fields */ diff --git a/Source/charon/encoding/payloads/transform_attribute.h b/Source/charon/encoding/payloads/transform_attribute.h index c436012ce..8a0deb765 100644 --- a/Source/charon/encoding/payloads/transform_attribute.h +++ b/Source/charon/encoding/payloads/transform_attribute.h @@ -119,9 +119,9 @@ struct transform_attribute_t { * @brief Clones an transform_attribute_t object. * * @param this transform_attribute_t object to clone - * @param clone the new clone will be written there + * @return cloned transform_attribute_t object */ - void (*clone) (transform_attribute_t *this,transform_attribute_t **clone); + transform_attribute_t * (*clone) (transform_attribute_t *this); /** * @brief Destroys an transform_attribute_t object. diff --git a/Source/charon/encoding/payloads/transform_substructure.c b/Source/charon/encoding/payloads/transform_substructure.c index cbbfb41e9..4e3655b15 100644 --- a/Source/charon/encoding/payloads/transform_substructure.c +++ b/Source/charon/encoding/payloads/transform_substructure.c @@ -261,9 +261,9 @@ static size_t get_length(private_transform_substructure_t *this) /** * Implementation of transform_substructure_t.create_transform_attribute_iterator. */ -static void create_transform_attribute_iterator (private_transform_substructure_t *this,iterator_t **iterator,bool forward) +static iterator_t *create_transform_attribute_iterator (private_transform_substructure_t *this,bool forward) { - this->attributes->create_iterator(this->attributes,iterator,forward); + return this->attributes->create_iterator(this->attributes,forward); } /** @@ -337,7 +337,7 @@ static void compute_length (private_transform_substructure_t *this) { iterator_t *iterator; size_t length = TRANSFORM_SUBSTRUCTURE_HEADER_LENGTH; - this->attributes->create_iterator(this->attributes,&iterator,TRUE); + iterator = this->attributes->create_iterator(this->attributes,TRUE); while (iterator->has_next(iterator)) { payload_t * current_attribute; @@ -353,7 +353,7 @@ static void compute_length (private_transform_substructure_t *this) /** * Implementation of transform_substructure_t.clone. */ -static void clone(private_transform_substructure_t *this,transform_substructure_t **clone) +static transform_substructure_t *clone(private_transform_substructure_t *this) { private_transform_substructure_t *new_clone; iterator_t *attributes; @@ -364,7 +364,7 @@ static void clone(private_transform_substructure_t *this,transform_substructure_ new_clone->transform_type = this->transform_type; new_clone->transform_id = this->transform_id; - this->attributes->create_iterator(this->attributes,&attributes,FALSE); + attributes = this->attributes->create_iterator(this->attributes,FALSE); while (attributes->has_next(attributes)) { @@ -372,14 +372,14 @@ static void clone(private_transform_substructure_t *this,transform_substructure_ transform_attribute_t *current_attribute_clone; attributes->current(attributes,(void **) ¤t_attribute); - current_attribute->clone(current_attribute,¤t_attribute_clone); + current_attribute_clone = current_attribute->clone(current_attribute); new_clone->public.add_transform_attribute(&(new_clone->public),current_attribute_clone); } attributes->destroy(attributes); - *clone = &(new_clone->public); + return &(new_clone->public); } @@ -390,7 +390,7 @@ static status_t get_key_length(private_transform_substructure_t *this, u_int16_t { iterator_t *attributes; - this->attributes->create_iterator(this->attributes,&attributes,TRUE); + attributes = this->attributes->create_iterator(this->attributes,TRUE); while (attributes->has_next(attributes)) { @@ -445,7 +445,7 @@ transform_substructure_t *transform_substructure_create() this->public.payload_interface.destroy = (void (*) (payload_t *))destroy; /* public functions */ - this->public.create_transform_attribute_iterator = (void (*) (transform_substructure_t *,iterator_t **,bool)) create_transform_attribute_iterator; + this->public.create_transform_attribute_iterator = (iterator_t * (*) (transform_substructure_t *,bool)) create_transform_attribute_iterator; this->public.add_transform_attribute = (void (*) (transform_substructure_t *,transform_attribute_t *)) add_transform_attribute; this->public.set_is_last_transform = (void (*) (transform_substructure_t *,bool)) set_is_last_transform; this->public.get_is_last_transform = (bool (*) (transform_substructure_t *)) get_is_last_transform; @@ -454,7 +454,7 @@ transform_substructure_t *transform_substructure_create() this->public.set_transform_id = (void (*) (transform_substructure_t *,u_int16_t)) set_transform_id; this->public.get_transform_id = (u_int16_t (*) (transform_substructure_t *)) get_transform_id; this->public.get_key_length = (status_t (*) (transform_substructure_t *,u_int16_t *)) get_key_length; - this->public.clone = (void (*) (transform_substructure_t *,transform_substructure_t **)) clone; + this->public.clone = (transform_substructure_t* (*) (transform_substructure_t *)) clone; this->public.destroy = (void (*) (transform_substructure_t *)) destroy; /* private functions */ diff --git a/Source/charon/encoding/payloads/transform_substructure.h b/Source/charon/encoding/payloads/transform_substructure.h index 39f642620..ac8684cc1 100644 --- a/Source/charon/encoding/payloads/transform_substructure.h +++ b/Source/charon/encoding/payloads/transform_substructure.h @@ -117,10 +117,10 @@ struct transform_substructure_t { * by calling get_length()! * * @param this calling transform_substructure_t object - * @param iterator the created iterator is stored at the pointed pointer * @param[in] forward iterator direction (TRUE: front to end) + * @return created iterator_t object. */ - void (*create_transform_attribute_iterator) (transform_substructure_t *this,iterator_t **iterator, bool forward); + iterator_t * (*create_transform_attribute_iterator) (transform_substructure_t *this, bool forward); /** * @brief Adds a transform_attribute_t object to this object. @@ -200,10 +200,9 @@ struct transform_substructure_t { * @brief Clones an transform_substructure_t object. * * @param this transform_substructure_t object to clone - * @param clone pointer to a transform_substructure_t object pointer - * where the new object is stored to. + * @return cloned transform_substructure_t object */ - void (*clone) (transform_substructure_t *this,transform_substructure_t **clone); + transform_substructure_t* (*clone) (transform_substructure_t *this); /** * @brief Destroys an transform_substructure_t object. |