diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-09-30 10:53:31 +0000 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-12-17 10:56:20 +0000 |
| commit | cbe25aab3be72154f2c706c39eeba6a77f34450f (patch) | |
| tree | 131fb53b5ec973be045ffb9e2eb797af01d112a0 /src/plugins/dhcp/dhcp6_ia_na_client_cp.c | |
| parent | 96453fd2417ebd1d69354a7fb692976129cea80e (diff) | |
ip: Protocol Independent IP Neighbors
Type: feature
- ip-neighbour: generic neighbour handling; APIs, DBs, event handling,
aging
- arp: ARP protocol implementation
- ip6-nd; IPv6 neighbor discovery implementation; separate ND,
MLD, RA
- ip6-link; manage link-local addresses
- l2-arp-term; events separated from IP neighbours, since they are not
the same.
vnet retains just enough education to perform ND/ARP packet
construction.
arp and ip6-nd to be moved to plugins soon.
Change-Id: I88dedd0006b299344f4c7024a0aa5baa6b9a8bbe
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/plugins/dhcp/dhcp6_ia_na_client_cp.c')
| -rw-r--r-- | src/plugins/dhcp/dhcp6_ia_na_client_cp.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c index f9c379cffe8..b48559929e4 100644 --- a/src/plugins/dhcp/dhcp6_ia_na_client_cp.c +++ b/src/plugins/dhcp/dhcp6_ia_na_client_cp.c @@ -20,6 +20,7 @@ #include <dhcp/dhcp6_ia_na_client_dp.h> #include <vnet/ip/ip.h> #include <vnet/ip/ip6.h> +#include <vnet/ip/ip6_link.h> #include <float.h> #include <math.h> @@ -144,17 +145,6 @@ send_client_message_start_stop (u32 sw_if_index, u32 server_index, static void interrupt_process (void); -static u32 -ip6_enable (u32 sw_if_index) -{ - dhcp6_client_cp_main_t *rm = &dhcp6_client_cp_main; - clib_error_t *rv; - - rv = enable_ip6_interface (rm->vlib_main, sw_if_index); - - return rv != 0; -} - static u8 ip6_addresses_equal (ip6_address_t * address1, ip6_address_t * address2) { @@ -422,7 +412,7 @@ dhcp6_client_cp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, clib_warning ("Failed to delete interface address"); pool_put (rm->address_pool, address_info); /* make sure ip6 stays enabled */ - ip6_enable (sw_if_index); + ip6_link_enable (sw_if_index); client_state = &rm->client_state_by_sw_if_index[sw_if_index]; if (--client_state->address_count == 0) { @@ -650,7 +640,7 @@ dhcp6_client_enable_disable (u32 sw_if_index, u8 enable) dhcp6_clients_enable_disable (1); } - ip6_enable (sw_if_index); + ip6_link_enable (sw_if_index); send_client_message_start_stop (sw_if_index, ~0, DHCPV6_MSG_SOLICIT, 0, 1); } |