denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- changed creation of iterator

Browse Source 
- chanded all clone calls
This commit is contained in:
Jan Hutter
2005-11-29 08:54:48 +00:00
parent c6ec246d0d
commit a0753941e1
24 changed files with 92 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/sa/ike_sa_manager.c
+4 -4
View File
@@ -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))
Source/charon/sa/states/ike_sa_init_requested.c
+2 -2
View File
@@ -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*/
Source/charon/sa/states/initiator_init.c
+3 -3
View File
@@ -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 **) &current_proposal);
current_proposal->clone(current_proposal,&current_proposal_clone);
current_proposal_clone = current_proposal->clone(current_proposal);
sa_payload->add_proposal_substructure(sa_payload,current_proposal_clone);
}
Source/charon/sa/states/responder_init.c
+5 -6
View File
@@ -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 **) &current_proposal);
current_proposal->clone(current_proposal,&current_proposal_clone);
current_proposal_clone = current_proposal->clone(current_proposal);
sa_payload->add_proposal_substructure(sa_payload,current_proposal_clone);
}