- moved linked_list_iterator_t to iterator_t, located in iterator.h
This commit is contained in:
@@ -226,7 +226,7 @@ struct private_ike_sa_manager_t {
|
||||
static status_t get_entry_by_id(private_ike_sa_manager_t *this, ike_sa_id_t *ike_sa_id, ike_sa_entry_t **entry)
|
||||
{
|
||||
linked_list_t *list = this->ike_sa_list;
|
||||
linked_list_iterator_t *iterator;
|
||||
iterator_t *iterator;
|
||||
status_t status;
|
||||
|
||||
/* create iterator over list of ike_sa's */
|
||||
@@ -279,7 +279,7 @@ static status_t get_entry_by_id(private_ike_sa_manager_t *this, ike_sa_id_t *ike
|
||||
static status_t get_entry_by_sa(private_ike_sa_manager_t *this, ike_sa_t *ike_sa, ike_sa_entry_t **entry)
|
||||
{
|
||||
linked_list_t *list = this->ike_sa_list;
|
||||
linked_list_iterator_t *iterator;
|
||||
iterator_t *iterator;
|
||||
status_t status;
|
||||
|
||||
status = list->create_iterator(list, &iterator, TRUE);
|
||||
@@ -315,7 +315,7 @@ static status_t get_entry_by_sa(private_ike_sa_manager_t *this, ike_sa_t *ike_sa
|
||||
static status_t delete_entry(private_ike_sa_manager_t *this, ike_sa_entry_t *entry)
|
||||
{
|
||||
linked_list_t *list = this->ike_sa_list;
|
||||
linked_list_iterator_t *iterator;
|
||||
iterator_t *iterator;
|
||||
status_t status;
|
||||
|
||||
status = list->create_iterator(list, &iterator, TRUE);
|
||||
@@ -686,7 +686,7 @@ static status_t destroy(private_ike_sa_manager_t *this)
|
||||
{
|
||||
/* destroy all list entries */
|
||||
linked_list_t *list = this->ike_sa_list;
|
||||
linked_list_iterator_t *iterator;
|
||||
iterator_t *iterator;
|
||||
status_t status;
|
||||
ike_sa_entry_t *entry;
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ struct private_ike_sa_init_requested_t {
|
||||
static status_t process_message(private_ike_sa_init_requested_t *this, message_t *message, state_t **new_state)
|
||||
{
|
||||
status_t status;
|
||||
linked_list_iterator_t *payloads;
|
||||
iterator_t *payloads;
|
||||
exchange_type_t exchange_type;
|
||||
u_int64_t responder_spi;
|
||||
|
||||
@@ -134,7 +134,7 @@ static status_t process_message(private_ike_sa_init_requested_t *this, message_t
|
||||
case SECURITY_ASSOCIATION:
|
||||
{
|
||||
sa_payload_t *sa_payload = (sa_payload_t*)payload;
|
||||
linked_list_iterator_t *suggested_proposals;
|
||||
iterator_t *suggested_proposals;
|
||||
encryption_algorithm_t encryption_algorithm = ENCR_UNDEFINED;
|
||||
pseudo_random_function_t pseudo_random_function = PRF_UNDEFINED;
|
||||
integrity_algorithm_t integrity_algorithm = AUTH_UNDEFINED;
|
||||
|
||||
@@ -148,7 +148,7 @@ struct private_initiator_init_t {
|
||||
*/
|
||||
static status_t initiate_connection (private_initiator_init_t *this, char *name, state_t **new_state)
|
||||
{
|
||||
linked_list_iterator_t *proposal_iterator;
|
||||
iterator_t *proposal_iterator;
|
||||
ike_sa_init_requested_t *next_state;
|
||||
message_t *message;
|
||||
packet_t *packet;
|
||||
@@ -370,7 +370,7 @@ static status_t build_ike_sa_init_request (private_initiator_init_t *this, messa
|
||||
static status_t build_sa_payload(private_initiator_init_t *this, payload_t **payload)
|
||||
{
|
||||
sa_payload_t* sa_payload;
|
||||
linked_list_iterator_t *proposal_iterator;
|
||||
iterator_t *proposal_iterator;
|
||||
status_t status;
|
||||
|
||||
/* SA payload takes proposals from this->ike_sa_init_data.proposals and writes them to the created sa_payload */
|
||||
|
||||
@@ -144,7 +144,7 @@ struct private_responder_init_t {
|
||||
*/
|
||||
static status_t process_message(private_responder_init_t *this, message_t *message, state_t **new_state)
|
||||
{
|
||||
linked_list_iterator_t *payloads;
|
||||
iterator_t *payloads;
|
||||
host_t *source, *destination;
|
||||
status_t status;
|
||||
message_t *response;
|
||||
@@ -204,7 +204,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
|
||||
case SECURITY_ASSOCIATION:
|
||||
{
|
||||
sa_payload_t *sa_payload = (sa_payload_t*)payload;
|
||||
linked_list_iterator_t *suggested_proposals, *accepted_proposals;
|
||||
iterator_t *suggested_proposals, *accepted_proposals;
|
||||
encryption_algorithm_t encryption_algorithm = ENCR_UNDEFINED;
|
||||
pseudo_random_function_t pseudo_random_function = PRF_UNDEFINED;
|
||||
integrity_algorithm_t integrity_algorithm = AUTH_UNDEFINED;
|
||||
@@ -490,7 +490,7 @@ static status_t process_message(private_responder_init_t *this, message_t *messa
|
||||
static status_t build_sa_payload(private_responder_init_t *this, payload_t **payload)
|
||||
{
|
||||
sa_payload_t* sa_payload;
|
||||
linked_list_iterator_t *proposal_iterator;
|
||||
iterator_t *proposal_iterator;
|
||||
status_t status;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user