Renamed list of additional peer addresses as it now stores all known addresses.

This commit is contained in:
Tobias Brunner
2012-03-09 10:17:42 +01:00
parent 2fe624cca9
commit 94bbc60256
7 changed files with 42 additions and 43 deletions
+2 -3
View File
@@ -260,9 +260,8 @@ static void process_ike_update(private_ha_dispatcher_t *this,
ike_sa->set_virtual_ip(ike_sa, FALSE, value.host);
received_vip = TRUE;
break;
case HA_ADDITIONAL_ADDR:
ike_sa->add_additional_address(ike_sa,
value.host->clone(value.host));
case HA_PEER_ADDR:
ike_sa->add_peer_address(ike_sa, value.host->clone(value.host));
break;
case HA_CONFIG_NAME:
peer_cfg = charon->backends->get_peer_cfg_by_name(
+2 -2
View File
@@ -185,10 +185,10 @@ METHOD(listener_t, ike_updown, bool,
m->add_attribute(m, HA_CONDITIONS, condition);
m->add_attribute(m, HA_EXTENSIONS, extension);
m->add_attribute(m, HA_CONFIG_NAME, peer_cfg->get_name(peer_cfg));
enumerator = ike_sa->create_additional_address_enumerator(ike_sa);
enumerator = ike_sa->create_peer_address_enumerator(ike_sa);
while (enumerator->enumerate(enumerator, (void**)&addr))
{
m->add_attribute(m, HA_ADDITIONAL_ADDR, addr);
m->add_attribute(m, HA_PEER_ADDR, addr);
}
enumerator->destroy(enumerator);
}
+2 -2
View File
@@ -184,7 +184,7 @@ METHOD(ha_message_t, add_attribute, void,
case HA_REMOTE_ADDR:
case HA_LOCAL_VIP:
case HA_REMOTE_VIP:
case HA_ADDITIONAL_ADDR:
case HA_PEER_ADDR:
{
host_encoding_t *enc;
host_t *host;
@@ -386,7 +386,7 @@ METHOD(enumerator_t, attribute_enumerate, bool,
case HA_REMOTE_ADDR:
case HA_LOCAL_VIP:
case HA_REMOTE_VIP:
case HA_ADDITIONAL_ADDR:
case HA_PEER_ADDR:
{
host_encoding_t *enc;
+2 -2
View File
@@ -98,8 +98,8 @@ enum ha_message_attribute_t {
HA_LOCAL_VIP,
/** host_t*, remote virtual IP */
HA_REMOTE_VIP,
/** host_t*, additional MOBIKE peer address */
HA_ADDITIONAL_ADDR,
/** host_t*, known peer addresses (used for MOBIKE) */
HA_PEER_ADDR,
/** u_int8_t, initiator of an exchange, TRUE for local */
HA_INITIATOR,
/** chunk_t, initiators nonce */