diff options
| author |   Neale Ranns <neale.ranns@cisco.com> | 2020-11-26 08:37:27 +0000 |
|---|---|---|
| committer |   Ole Tr�an <otroan@employees.org> | 2020-12-08 09:00:24 +0000 |
| commit | e2fe097424fb169dfe01421ff17b8ccd0c26b4a6 (patch) | |
| tree | 2d9993f78d9165c1aba23b1daa4067106da81b45 /src/plugins/vrrp | |
| parent | 9b8cb5082471dd670066b8ba2872ffbcc35a87f8 (diff) | |
fib: Source Address Selection
Type: feature
Use the FIB to provide SAS (in so far as it is today)
- Use the glean adjacency as the record of the connected prefixes
= there's a glean per-{interface, protocol, connected-prefix}
- Keep the glean up to date with whatever the recieve host prefix is
(since it can change)
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Change-Id: I0f3dd1edb1f3fc965af1c7c586709028eb9cdeac
Diffstat (limited to 'src/plugins/vrrp')
| -rw-r--r-- | src/plugins/vrrp/node.c | 4 | ||||
| -rw-r--r-- | src/plugins/vrrp/vrrp_packet.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/vrrp/node.c b/src/plugins/vrrp/node.c index 486c1a819c2..7ba18c4f75c 100644 --- a/src/plugins/vrrp/node.c +++ b/src/plugins/vrrp/node.c @@ -12,6 +12,7 @@ #include <vnet/ip/ip4_packet.h> #include <vnet/ip/ip6_link.h> #include <vnet/ethernet/arp_packet.h> +#include <vnet/fib/fib_sas.h> #include <vppinfra/error.h> #include <vrrp/vrrp.h> #include <vrrp/vrrp_packet.h> @@ -119,8 +120,7 @@ vrrp_vr_addr_cmp (vrrp_vr_t * vr, vrrp_header_t * pkt) peer_addr = &(((ip4_header_t *) pkt) - 1)->src_address; local_addr = &addr.ip4; addr_size = 4; - ip4_src_address_for_packet (&ip4_main.lookup_main, - vrc->sw_if_index, local_addr); + fib_sas4_get (vrc->sw_if_index, NULL, local_addr); } return memcmp (local_addr, peer_addr, addr_size); diff --git a/src/plugins/vrrp/vrrp_packet.c b/src/plugins/vrrp/vrrp_packet.c index 6b0d4c96c2d..b77f336930a 100644 --- a/src/plugins/vrrp/vrrp_packet.c +++ b/src/plugins/vrrp/vrrp_packet.c @@ -14,6 +14,7 @@ #include <vnet/adj/adj.h> #include <vnet/adj/adj_mcast.h> #include <vnet/fib/fib_table.h> +#include <vnet/fib/fib_sas.h> #include <vnet/ip/igmp_packet.h> #include <vnet/ip/ip6_link.h> #include <vnet/ethernet/arp_packet.h> @@ -107,8 +108,7 @@ vrrp_adv_l3_build (vrrp_vr_t * vr, vlib_buffer_t * b, ip4->ttl = 255; ip4->protocol = IP_PROTOCOL_VRRP; clib_memcpy (&ip4->dst_address, &dst->ip4, sizeof (dst->ip4)); - ip4_src_address_for_packet (&ip4_main.lookup_main, - vr->config.sw_if_index, &ip4->src_address); + fib_sas4_get (vr->config.sw_if_index, NULL, &ip4->src_address); ip4->length = clib_host_to_net_u16 (sizeof (*ip4) + vrrp_adv_payload_len (vr)); ip4->checksum = ip4_header_checksum (ip4); @@ -541,8 +541,7 @@ vrrp_igmp_pkt_build (vrrp_vr_t * vr, vlib_buffer_t * b) ip4 = vlib_buffer_get_current (b); clib_memcpy (ip4, &igmp_ip4_mcast, sizeof (*ip4)); - ip4_src_address_for_packet (&ip4_main.lookup_main, vr->config.sw_if_index, - &ip4->src_address); + fib_sas4_get (vr->config.sw_if_index, NULL, &ip4->src_address); vlib_buffer_chain_increase_length (b, b, sizeof (*ip4)); vlib_buffer_advance (b, sizeof (*ip4)); |