diff options
Diffstat (limited to 'Source/charon/sa')
| -rw-r--r-- | Source/charon/sa/ike_sa_manager.c | 8 | ||||
| -rw-r--r-- | Source/charon/sa/states/ike_sa_init_requested.c | 4 | ||||
| -rw-r--r-- | Source/charon/sa/states/initiator_init.c | 6 | ||||
| -rw-r--r-- | Source/charon/sa/states/responder_init.c | 11 |
4 files changed, 14 insertions, 15 deletions
diff --git a/Source/charon/sa/ike_sa_manager.c b/Source/charon/sa/ike_sa_manager.c index 943502dcb..34b2a09b3 100644 --- a/Source/charon/sa/ike_sa_manager.c +++ b/Source/charon/sa/ike_sa_manager.c @@ -209,7 +209,7 @@ static status_t get_entry_by_id(private_ike_sa_manager_t *this, ike_sa_id_t *ike status_t status; /* create iterator over list of ike_sa's */ - list->create_iterator(list, &iterator, TRUE); + iterator = list->create_iterator(list, TRUE); /* default status */ status = NOT_FOUND; @@ -252,7 +252,7 @@ static status_t get_entry_by_sa(private_ike_sa_manager_t *this, ike_sa_t *ike_sa iterator_t *iterator; status_t status; - list->create_iterator(list, &iterator, TRUE); + iterator = list->create_iterator(list, TRUE); /* default status */ status = NOT_FOUND; @@ -284,7 +284,7 @@ static status_t delete_entry(private_ike_sa_manager_t *this, ike_sa_entry_t *ent iterator_t *iterator; status_t status; - list->create_iterator(list, &iterator, TRUE); + iterator = list->create_iterator(list, TRUE); status = NOT_FOUND; @@ -606,7 +606,7 @@ static void destroy(private_ike_sa_manager_t *this) this->logger->log(this->logger,CONTROL | MORE,"Going to destroy IKE_SA manager and all managed IKE_SA's"); /* Step 1: drive out all waiting threads */ - list->create_iterator(list, &iterator, TRUE); + iterator = list->create_iterator(list, TRUE); this->logger->log(this->logger,CONTROL | MOST,"Set driveout flags for all stored IKE_SA's"); while (iterator->has_next(iterator)) diff --git a/Source/charon/sa/states/ike_sa_init_requested.c b/Source/charon/sa/states/ike_sa_init_requested.c index d682a769c..d5ad12cf4 100644 --- a/Source/charon/sa/states/ike_sa_init_requested.c +++ b/Source/charon/sa/states/ike_sa_init_requested.c @@ -120,7 +120,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t ike_sa_id->set_responder_spi(ike_sa_id,responder_spi); /* iterate over incoming payloads */ - message->get_payload_iterator(message, &payloads); + payloads = message->get_payload_iterator(message); while (payloads->has_next(payloads)) { payload_t *payload; @@ -138,7 +138,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t /* get the list of suggested proposals */ - sa_payload->create_proposal_substructure_iterator(sa_payload, &suggested_proposals, TRUE); + suggested_proposals = sa_payload->create_proposal_substructure_iterator(sa_payload, TRUE); /* now let the configuration-manager check the selected proposals*/ diff --git a/Source/charon/sa/states/initiator_init.c b/Source/charon/sa/states/initiator_init.c index b1e25a4c5..ade422fb1 100644 --- a/Source/charon/sa/states/initiator_init.c +++ b/Source/charon/sa/states/initiator_init.c @@ -174,7 +174,7 @@ static status_t initiate_connection (private_initiator_init_t *this, char *name) } /* get proposals */ - this->proposals->create_iterator(this->proposals, &proposal_iterator, FALSE); + proposal_iterator = this->proposals->create_iterator(this->proposals, FALSE); status = global_configuration_manager->get_proposals_for_host(global_configuration_manager, this->ike_sa->get_other_host(this->ike_sa), proposal_iterator); proposal_iterator->destroy(proposal_iterator); if (status != SUCCESS) @@ -292,7 +292,7 @@ static void build_sa_payload(private_initiator_init_t *this, payload_t **payload */ this->logger->log(this->logger, CONTROL|MORE, "building sa payload"); - this->proposals->create_iterator(this->proposals, &proposal_iterator, FALSE); + proposal_iterator = this->proposals->create_iterator(this->proposals, FALSE); sa_payload = sa_payload_create(); @@ -302,7 +302,7 @@ static void build_sa_payload(private_initiator_init_t *this, payload_t **payload proposal_substructure_t *current_proposal_clone; proposal_iterator->current(proposal_iterator,(void **) ¤t_proposal); - current_proposal->clone(current_proposal,¤t_proposal_clone); + current_proposal_clone = current_proposal->clone(current_proposal); sa_payload->add_proposal_substructure(sa_payload,current_proposal_clone); } diff --git a/Source/charon/sa/states/responder_init.c b/Source/charon/sa/states/responder_init.c index 57e75037b..b528be0e2 100644 --- a/Source/charon/sa/states/responder_init.c +++ b/Source/charon/sa/states/responder_init.c @@ -179,9 +179,8 @@ static status_t process_message(private_responder_init_t *this, message_t *messa this->logger->log(this->logger, ERROR | MORE, "Could not parse body of request message"); return status; } - /* iterate over incoming payloads. We can be sure, the message contains only accepted payloads! */ - message->get_payload_iterator(message, &payloads); + payloads = message->get_payload_iterator(message); while (payloads->has_next(payloads)) { @@ -199,10 +198,10 @@ static status_t process_message(private_responder_init_t *this, message_t *messa iterator_t *suggested_proposals, *accepted_proposals; proposal_substructure_t *accepted_proposal; - this->proposals->create_iterator(this->proposals, &accepted_proposals, FALSE); + accepted_proposals = this->proposals->create_iterator(this->proposals, FALSE); /* get the list of suggested proposals */ - sa_payload->create_proposal_substructure_iterator(sa_payload, &suggested_proposals, TRUE); + suggested_proposals = sa_payload->create_proposal_substructure_iterator(sa_payload, TRUE); /* now let the configuration-manager select a subset of the proposals */ status = global_configuration_manager->select_proposals_for_host(global_configuration_manager, @@ -395,7 +394,7 @@ static void build_sa_payload(private_responder_init_t *this, payload_t **payload this->logger->log(this->logger, CONTROL|MORE, "building sa payload"); - this->proposals->create_iterator(this->proposals, &proposal_iterator, FALSE); + proposal_iterator = this->proposals->create_iterator(this->proposals, FALSE); sa_payload = sa_payload_create(); @@ -405,7 +404,7 @@ static void build_sa_payload(private_responder_init_t *this, payload_t **payload proposal_substructure_t *current_proposal_clone; proposal_iterator->current(proposal_iterator,(void **) ¤t_proposal); - current_proposal->clone(current_proposal,¤t_proposal_clone); + current_proposal_clone = current_proposal->clone(current_proposal); sa_payload->add_proposal_substructure(sa_payload,current_proposal_clone); } |