/*
- * Copyright (C) 2006-2011 Tobias Brunner
+ * Copyright (C) 2006-2012 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2009 Martin Willi
* Copyright (C) 2005 Jan Hutter
linked_list_t *attributes;
/**
- * list of peers additional addresses, transmitted via MOBIKE
+ * list of peer's addresses, additional ones transmitted via MOBIKE
*/
- linked_list_t *additional_addresses;
+ linked_list_t *peer_addresses;
/**
* previously value of received DESTINATION_IP hash
}
}
-METHOD(ike_sa_t, add_additional_address, void,
+METHOD(ike_sa_t, add_peer_address, void,
private_ike_sa_t *this, host_t *host)
{
- this->additional_addresses->insert_last(this->additional_addresses, host);
+ this->peer_addresses->insert_last(this->peer_addresses, host);
}
-METHOD(ike_sa_t, create_additional_address_enumerator, enumerator_t*,
+METHOD(ike_sa_t, create_peer_address_enumerator, enumerator_t*,
private_ike_sa_t *this)
{
- return this->additional_addresses->create_enumerator(
- this->additional_addresses);
+ return this->peer_addresses->create_enumerator(this->peer_addresses);
}
-METHOD(ike_sa_t, remove_additional_addresses, void,
+METHOD(ike_sa_t, clear_peer_addresses, void,
private_ike_sa_t *this)
{
- enumerator_t *enumerator = create_additional_address_enumerator(this);
+ enumerator_t *enumerator = create_peer_address_enumerator(this);
host_t *host;
+
while (enumerator->enumerate(enumerator, (void**)&host))
{
- this->additional_addresses->remove_at(this->additional_addresses,
- enumerator);
+ this->peer_addresses->remove_at(this->peer_addresses,
+ enumerator);
host->destroy(host);
}
enumerator->destroy(enumerator);
this->other_host, NULL);
if (!src)
{
- enumerator = this->additional_addresses->create_enumerator(
- this->additional_addresses);
+ enumerator = this->peer_addresses->create_enumerator(
+ this->peer_addresses);
while (enumerator->enumerate(enumerator, &addr))
{
DBG1(DBG_IKE, "looking for a route to %H ...", addr);
}
this->other_virtual_ip->destroy(this->other_virtual_ip);
}
- this->additional_addresses->destroy_offset(this->additional_addresses,
- offsetof(host_t, destroy));
+ this->peer_addresses->destroy_offset(this->peer_addresses,
+ offsetof(host_t, destroy));
#ifdef ME
if (this->is_mediation_server)
{
.has_condition = _has_condition,
.set_pending_updates = _set_pending_updates,
.get_pending_updates = _get_pending_updates,
- .create_additional_address_enumerator = _create_additional_address_enumerator,
- .add_additional_address = _add_additional_address,
- .remove_additional_addresses = _remove_additional_addresses,
+ .create_peer_address_enumerator = _create_peer_address_enumerator,
+ .add_peer_address = _add_peer_address,
+ .clear_peer_addresses = _clear_peer_addresses,
.has_mapping_changed = _has_mapping_changed,
.retransmit = _retransmit,
.delete = _delete_,
.my_auths = linked_list_create(),
.other_auths = linked_list_create(),
.unique_id = ++unique_id,
- .additional_addresses = linked_list_create(),
+ .peer_addresses = linked_list_create(),
.attributes = linked_list_create(),
.keepalive_interval = lib->settings->get_time(lib->settings,
"charon.keep_alive", KEEPALIVE_INTERVAL),
/*
- * Copyright (C) 2006-2011 Tobias Brunner
+ * Copyright (C) 2006-2012 Tobias Brunner
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005-2009 Martin Willi
* Copyright (C) 2005 Jan Hutter
*
* @param host host to add to list
*/
- void (*add_additional_address)(ike_sa_t *this, host_t *host);
+ void (*add_peer_address)(ike_sa_t *this, host_t *host);
/**
- * Create an enumerator over all additional addresses of the peer.
+ * Create an enumerator over all known addresses of the peer.
*
* @return enumerator over addresses
*/
- enumerator_t* (*create_additional_address_enumerator)(ike_sa_t *this);
+ enumerator_t* (*create_peer_address_enumerator)(ike_sa_t *this);
/**
- * Remove all additional addresses of the peer.
+ * Remove all known addresses of the peer.
*/
- void (*remove_additional_addresses)(ike_sa_t *this);
+ void (*clear_peer_addresses)(ike_sa_t *this);
/**
* Check if mappings have changed on a NAT for our source address.
/*
+ * Copyright (C) 2010-2012 Tobias Brunner
* Copyright (C) 2007 Martin Willi
* Hochschule fuer Technik Rapperswil
*
{
if (first)
{ /* an ADDITIONAL_*_ADDRESS means replace, so flush once */
- this->ike_sa->remove_additional_addresses(this->ike_sa);
+ this->ike_sa->clear_peer_addresses(this->ike_sa);
first = FALSE;
/* add the peer's current address to the list */
host = this->ike_sa->get_other_host(this->ike_sa);
- this->ike_sa->add_additional_address(this->ike_sa,
- host->clone(host));
+ this->ike_sa->add_peer_address(this->ike_sa,
+ host->clone(host));
}
data = notify->get_notification_data(notify);
host = host_create_from_chunk(family, data, 0);
DBG2(DBG_IKE, "got additional MOBIKE peer address: %H", host);
- this->ike_sa->add_additional_address(this->ike_sa, host);
+ this->ike_sa->add_peer_address(this->ike_sa, host);
this->addresses_updated = TRUE;
break;
}
}
case NO_ADDITIONAL_ADDRESSES:
{
- this->ike_sa->remove_additional_addresses(this->ike_sa);
+ this->ike_sa->clear_peer_addresses(this->ike_sa);
/* add the peer's current address to the list */
host = this->ike_sa->get_other_host(this->ike_sa);
- this->ike_sa->add_additional_address(this->ike_sa,
- host->clone(host));
+ this->ike_sa->add_peer_address(this->ike_sa, host->clone(host));
this->addresses_updated = TRUE;
break;
}
charon->sender->send(charon->sender, copy);
}
- enumerator = this->ike_sa->create_additional_address_enumerator(this->ike_sa);
+ enumerator = this->ike_sa->create_peer_address_enumerator(this->ike_sa);
while (enumerator->enumerate(enumerator, (void**)&other))
{
me = hydra->kernel_interface->get_source_addr(