*/
#include <igmp/igmp_pkt.h>
+#include <vnet/fib/fib_sas.h>
static void
vlib_buffer_append (vlib_buffer_t * b, uword l)
ip4->protocol = IP_PROTOCOL_IGMP;
ip4->tos = 0xc0;
- ip4_src_address_for_packet (&ip4_main.lookup_main,
- bk->sw_if_index, &ip4->src_address);
+ fib_sas4_get (bk->sw_if_index, NULL, &ip4->src_address);
vlib_buffer_append (b, sizeof (*ip4));
bk->n_avail -= sizeof (*ip4);
#include <vlib/vlib.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/fib/ip4_fib.h>
-#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_sas.h>
#include <vnet/ip/ip6_link.h>
#include <vnet/plugin/plugin.h>
#include <vpp/app/version.h>
}
}
-static int
+static bool
ip46_set_src_address (u32 sw_if_index, vlib_buffer_t * b0, int is_ip6)
{
- int res;
+ bool res = false;
+
if (is_ip6)
{
ip6_header_t *ip6 = vlib_buffer_get_current (b0);
- res = ip6_src_address_for_packet (sw_if_index,
- &ip6->dst_address, &ip6->src_address);
+
+ res = fib_sas6_get (sw_if_index, &ip6->dst_address, &ip6->src_address);
}
else
{
- ip4_main_t *im = &ip4_main;
ip4_header_t *ip4 = vlib_buffer_get_current (b0);
- res = ip4_src_address_for_packet (&im->lookup_main,
- sw_if_index, &ip4->src_address);
- /* IP4 and IP6 paths have the inverse logic. Harmonize. */
- res = !res;
+
+ res = fib_sas4_get (sw_if_index, &ip4->dst_address, &ip4->src_address);
}
return res;
}
adj = adj_get(ai);
FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
"attached interface adj is glean");
- FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
- &adj->sub_type.glean.receive_addr)),
- "attached interface adj is receive ok");
local_pfx.fp_len = 32;
fib_table_entry_update_one_path(fib_index, &local_pfx,
FIB_PROTOCOL_IP4,
FIB_SOURCE_INTERFACE)),
"2 Interface Source'd prefixes");
+ FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+ &adj->sub_type.glean.rx_pfx.fp_addr)),
+ "attached interface adj is receive ok");
/*
* +2 interface routes +2 non-shared path-lists
adj = adj_get(ai);
FIB_TEST((IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index),
"attached interface adj is glean");
- FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
- &adj->sub_type.glean.receive_addr)),
- "attached interface adj is receive ok");
dpo = fib_entry_contribute_ip_forwarding(fei);
FIB_TEST((dpo->dpoi_index == ip6_fib_table_fwding_lookup(
1,
1,
&local_pfx.fp_addr.ip6)),
"local-route; fwd and non-fwd tables match");
+ FIB_TEST((0 == ip46_address_cmp(&local_pfx.fp_addr,
+ &adj->sub_type.glean.rx_pfx.fp_addr)),
+ "attached interface adj is receive ok");
/*
* +2 entries. +2 unshared path-lists
FIB_TEST((0 == adj_nbr_db_size()), "ADJ DB size is %d",
adj_nbr_db_size());
+ FIB_TEST((0 == adj_glean_db_size()), "ADJ DB size is %d",
+ adj_glean_db_size());
return (res);
}
#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>
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);
#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>
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);
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));
fib/fib_path_list.c
fib/fib_path.c
fib/fib_path_ext.c
+ fib/fib_sas.c
fib/fib_source.c
fib/fib_urpf_list.c
fib/fib_attached_export.c
fib/fib_node_list.h
fib/fib_entry.h
fib/fib_entry_delegate.h
+ fib/fib_sas.h
fib/fib_source.h
)
adj->rewrite_header.sw_if_index);
break;
case IP_LOOKUP_NEXT_GLEAN:
- adj_glean_remove(adj->ia_nh_proto,
- adj->rewrite_header.sw_if_index);
+ adj_glean_remove(adj);
break;
case IP_LOOKUP_NEXT_MCAST_MIDCHAIN:
adj_midchain_teardown(adj);
*/
struct
{
- ip46_address_t receive_addr;
+ fib_prefix_t rx_pfx;
} glean;
} sub_type;
/*
* The 'DB' of all glean adjs.
- * There is only one glean per-interface per-protocol, so this is a per-interface
- * vector
+ * There is one glean per-{interface, protocol, connected prefix}
*/
-static adj_index_t *adj_gleans[FIB_PROTOCOL_MAX];
+static uword **adj_gleans[FIB_PROTOCOL_IP_MAX];
static inline u32
adj_get_glean_node (fib_protocol_t proto)
return (~0);
}
+static adj_index_t
+adj_glean_db_lookup (fib_protocol_t proto,
+ u32 sw_if_index,
+ const ip46_address_t *nh_addr)
+{
+ uword *p;
+
+ if (vec_len(adj_gleans[proto]) <= sw_if_index)
+ return (ADJ_INDEX_INVALID);
+
+ p = hash_get_mem (adj_gleans[proto][sw_if_index], nh_addr);
+
+ if (p)
+ return (p[0]);
+
+ return (ADJ_INDEX_INVALID);
+}
+
+static void
+adj_glean_db_insert (fib_protocol_t proto,
+ u32 sw_if_index,
+ const ip46_address_t *nh_addr,
+ adj_index_t ai)
+{
+ vlib_main_t *vm = vlib_get_main();
+
+ vlib_worker_thread_barrier_sync(vm);
+
+ vec_validate(adj_gleans[proto], sw_if_index);
+
+ if (NULL == adj_gleans[proto][sw_if_index])
+ {
+ adj_gleans[proto][sw_if_index] =
+ hash_create_mem (0, sizeof(ip46_address_t), sizeof(adj_index_t));
+ }
+
+ hash_set_mem_alloc (&adj_gleans[proto][sw_if_index],
+ nh_addr, ai);
+
+ vlib_worker_thread_barrier_release(vm);
+}
+
+static void
+adj_glean_db_remove (fib_protocol_t proto,
+ u32 sw_if_index,
+ const ip46_address_t *nh_addr)
+{
+ vlib_main_t *vm = vlib_get_main();
+
+ vlib_worker_thread_barrier_sync(vm);
+
+ ASSERT(ADJ_INDEX_INVALID != adj_glean_db_lookup(proto, sw_if_index, nh_addr));
+ hash_unset_mem_free (&adj_gleans[proto][sw_if_index],
+ nh_addr);
+
+ if (0 == hash_elts(adj_gleans[proto][sw_if_index]))
+ {
+ hash_free(adj_gleans[proto][sw_if_index]);
+ adj_gleans[proto][sw_if_index] = NULL;
+ }
+ vlib_worker_thread_barrier_release(vm);
+}
+
/*
* adj_glean_add_or_lock
*
adj_glean_add_or_lock (fib_protocol_t proto,
vnet_link_t linkt,
u32 sw_if_index,
- const ip46_address_t *nh_addr)
+ const fib_prefix_t *conn)
{
ip_adjacency_t * adj;
+ adj_index_t ai;
- vec_validate_init_empty(adj_gleans[proto], sw_if_index, ADJ_INDEX_INVALID);
+ ai = adj_glean_db_lookup(proto, sw_if_index, &conn->fp_addr);
- if (ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
+ if (ADJ_INDEX_INVALID == ai)
{
adj = adj_alloc(proto);
adj->ia_nh_proto = proto;
adj->ia_link = linkt;
adj->ia_node_index = adj_get_glean_node(proto);
- adj_gleans[proto][sw_if_index] = adj_get_index(adj);
-
- if (NULL != nh_addr)
- {
- adj->sub_type.glean.receive_addr = *nh_addr;
- }
- else
- {
- adj->sub_type.glean.receive_addr = zero_addr;
- }
+ ai = adj_get_index(adj);
+ adj_lock(ai);
+ ASSERT(conn);
+ fib_prefix_normalize(conn, &adj->sub_type.glean.rx_pfx);
adj->rewrite_header.sw_if_index = sw_if_index;
adj->rewrite_header.data_bytes = 0;
adj->rewrite_header.max_l3_packet_bytes =
vnet_sw_interface_get_mtu(vnet_get_main(), sw_if_index,
vnet_link_to_mtu(linkt));
- adj_lock(adj_get_index(adj));
vnet_update_adjacency_for_sw_interface(vnet_get_main(),
sw_if_index,
- adj_get_index(adj));
+ ai);
+
+ adj_glean_db_insert(proto, sw_if_index,
+ &adj->sub_type.glean.rx_pfx.fp_addr, ai);
}
else
{
- adj = adj_get(adj_gleans[proto][sw_if_index]);
- adj_lock(adj_get_index(adj));
+ adj = adj_get(ai);
+ adj_lock(ai);
}
adj_delegate_adj_created(adj);
- return (adj_get_index(adj));
+ return (ai);
}
/**
sizeof (adj->rewrite_data));
}
+static adj_walk_rc_t
+adj_glean_update_rewrite_walk (adj_index_t ai,
+ void *data)
+{
+ adj_glean_update_rewrite(ai);
+
+ return (ADJ_WALK_RC_CONTINUE);
+}
+
+void
+adj_glean_update_rewrite_itf (u32 sw_if_index)
+{
+ adj_glean_walk (sw_if_index, adj_glean_update_rewrite_walk, NULL);
+}
+
+void
+adj_glean_walk (u32 sw_if_index,
+ adj_walk_cb_t cb,
+ void *data)
+{
+ fib_protocol_t proto;
+
+ FOR_EACH_FIB_IP_PROTOCOL(proto)
+ {
+ adj_index_t ai, *aip, *ais = NULL;
+ ip46_address_t *conn;
+
+ if (vec_len(adj_gleans[proto]) <= sw_if_index ||
+ NULL == adj_gleans[proto][sw_if_index])
+ continue;
+
+ /*
+ * Walk first to collect the indices
+ * then walk the collection. This is safe
+ * to modifications of the hash table
+ */
+ hash_foreach_mem(conn, ai, adj_gleans[proto][sw_if_index],
+ ({
+ vec_add1(ais, ai);
+ }));
+
+ vec_foreach(aip, ais)
+ {
+ if (ADJ_WALK_RC_STOP == cb(*aip, data))
+ break;
+ }
+ vec_free(ais);
+ }
+}
+
adj_index_t
adj_glean_get (fib_protocol_t proto,
- u32 sw_if_index)
+ u32 sw_if_index,
+ const ip46_address_t *nh)
{
- if (sw_if_index < vec_len(adj_gleans[proto]))
+ if (NULL != nh)
{
- return (adj_gleans[proto][sw_if_index]);
+ return adj_glean_db_lookup(proto, sw_if_index, nh);
+ }
+ else
+ {
+ ip46_address_t *conn;
+ adj_index_t ai;
+
+ if (vec_len(adj_gleans[proto]) <= sw_if_index ||
+ NULL == adj_gleans[proto][sw_if_index])
+ return (ADJ_INDEX_INVALID);
+
+ hash_foreach_mem(conn, ai, adj_gleans[proto][sw_if_index],
+ ({
+ return (ai);
+ }));
}
return (ADJ_INDEX_INVALID);
}
+const ip46_address_t *
+adj_glean_get_src (fib_protocol_t proto,
+ u32 sw_if_index,
+ const ip46_address_t *nh)
+{
+ const ip_adjacency_t *adj;
+ ip46_address_t *conn;
+ adj_index_t ai;
+
+ if (vec_len(adj_gleans[proto]) <= sw_if_index ||
+ NULL == adj_gleans[proto][sw_if_index])
+ return (NULL);
+
+ fib_prefix_t pfx = {
+ .fp_len = fib_prefix_get_host_length(proto),
+ .fp_proto = proto,
+ };
+
+ if (nh)
+ pfx.fp_addr = *nh;
+
+ hash_foreach_mem(conn, ai, adj_gleans[proto][sw_if_index],
+ ({
+ adj = adj_get(ai);
+
+ if (adj->sub_type.glean.rx_pfx.fp_len > 0)
+ {
+ /* if no destination is specified use the just glean */
+ if (NULL == nh)
+ return (&adj->sub_type.glean.rx_pfx.fp_addr);
+
+ /* check the clean covers the desintation */
+ if (fib_prefix_is_cover(&adj->sub_type.glean.rx_pfx, &pfx))
+ return (&adj->sub_type.glean.rx_pfx.fp_addr);
+ }
+ }));
+
+ return (NULL);
+}
+
void
-adj_glean_remove (fib_protocol_t proto,
- u32 sw_if_index)
+adj_glean_remove (ip_adjacency_t *adj)
{
- ASSERT(sw_if_index < vec_len(adj_gleans[proto]));
+ fib_prefix_t norm;
- adj_gleans[proto][sw_if_index] = ADJ_INDEX_INVALID;
+ fib_prefix_normalize(&adj->sub_type.glean.rx_pfx,
+ &norm);
+ adj_glean_db_remove(adj->ia_nh_proto,
+ adj->rewrite_header.sw_if_index,
+ &norm.fp_addr);
+}
+
+static adj_walk_rc_t
+adj_glean_start_backwalk (adj_index_t ai,
+ void *data)
+{
+ fib_node_back_walk_ctx_t bw_ctx = *(fib_node_back_walk_ctx_t*) data;
+
+ fib_walk_sync(FIB_NODE_TYPE_ADJ, ai, &bw_ctx);
+
+ return (ADJ_WALK_RC_CONTINUE);
}
static clib_error_t *
/*
* for each glean on the interface trigger a walk back to the children
*/
- fib_protocol_t proto;
- ip_adjacency_t *adj;
-
- FOR_EACH_FIB_IP_PROTOCOL(proto)
- {
- if (sw_if_index >= vec_len(adj_gleans[proto]) ||
- ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
- continue;
+ fib_node_back_walk_ctx_t bw_ctx = {
+ .fnbw_reason = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP ?
+ FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
+ FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
+ };
- adj = adj_get(adj_gleans[proto][sw_if_index]);
-
- fib_node_back_walk_ctx_t bw_ctx = {
- .fnbw_reason = (flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP ?
- FIB_NODE_BW_REASON_FLAG_INTERFACE_UP :
- FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN),
- };
-
- fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
- }
+ adj_glean_walk (sw_if_index, adj_glean_start_backwalk, &bw_ctx);
return (NULL);
}
u32 sw_if_index,
u32 is_add)
{
- /*
- * for each glean on the interface trigger a walk back to the children
- */
- fib_protocol_t proto;
- ip_adjacency_t *adj;
-
if (is_add)
{
/*
return (NULL);
}
- FOR_EACH_FIB_IP_PROTOCOL(proto)
- {
- if (sw_if_index >= vec_len(adj_gleans[proto]) ||
- ADJ_INDEX_INVALID == adj_gleans[proto][sw_if_index])
- continue;
-
- adj = adj_get(adj_gleans[proto][sw_if_index]);
-
- fib_node_back_walk_ctx_t bw_ctx = {
- .fnbw_reason = FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
- };
+ /*
+ * for each glean on the interface trigger a walk back to the children
+ */
+ fib_node_back_walk_ctx_t bw_ctx = {
+ .fnbw_reason = FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE,
+ };
- fib_walk_sync(FIB_NODE_TYPE_ADJ, adj_get_index(adj), &bw_ctx);
- }
+ adj_glean_walk (sw_if_index, adj_glean_start_backwalk, &bw_ctx);
return (NULL);
}
CLIB_UNUSED(u32 indent) = va_arg(*ap, u32);
ip_adjacency_t * adj = adj_get(index);
- s = format(s, "%U-glean: %U",
+ s = format(s, "%U-glean: [src:%U] %U",
format_fib_protocol, adj->ia_nh_proto,
- format_vnet_rewrite,
- &adj->rewrite_header, sizeof (adj->rewrite_data), 0);
+ format_fib_prefix, &adj->sub_type.glean.rx_pfx,
+ format_vnet_rewrite,
+ &adj->rewrite_header, sizeof (adj->rewrite_data), 0);
return (s);
}
+u32
+adj_glean_db_size (void)
+{
+ fib_protocol_t proto;
+ u32 sw_if_index = 0;
+ u64 count = 0;
+
+ FOR_EACH_FIB_IP_PROTOCOL(proto)
+ {
+ vec_foreach_index(sw_if_index, adj_gleans[proto])
+ {
+ if (NULL != adj_gleans[proto][sw_if_index])
+ {
+ count += hash_elts(adj_gleans[proto][sw_if_index]);
+ }
+ }
+ }
+ return (count);
+}
static void
adj_dpo_lock (dpo_id_t *dpo)
extern adj_index_t adj_glean_add_or_lock(fib_protocol_t proto,
vnet_link_t linkt,
u32 sw_if_index,
- const ip46_address_t *nh_addr);
+ const fib_prefix_t *conn);
/**
* @brief Get an existing glean
* @return INVALID if it does not exist
*/
extern adj_index_t adj_glean_get(fib_protocol_t proto,
- u32 sw_if_index);
+ u32 sw_if_index,
+ const ip46_address_t *nh_addr);
/**
* adj_glean_update_rewrite
* glean behaviour on an adjacency liked to a connected prefix.
*/
extern void adj_glean_update_rewrite(adj_index_t adj_index);
+extern void adj_glean_update_rewrite_itf(u32 sw_if_index);
+
+/**
+ * Return the source address from the glean
+ */
+const ip46_address_t *adj_glean_get_src(fib_protocol_t proto,
+ u32 sw_if_index,
+ const ip46_address_t *nh_addr);
/**
* @brief Format/display a glean adjacency.
*/
extern u8* format_adj_glean(u8* s, va_list *ap);
+/**
+ * Walk all the gleans on an interface
+ */
+extern void adj_glean_walk (u32 sw_if_index,
+ adj_walk_cb_t,
+ void *);
+
/**
* @brief
* Module initialisation
*/
extern void adj_glean_module_init(void);
+/**
+ * @brief
+ * Return the size of the adjacency database. for testing purposes
+ */
+extern u32 adj_glean_db_size(void);
+
#endif
vnet_link_t link_type,
const ip46_address_t *nh_addr,
u32 sw_if_index);
-extern void adj_glean_remove(fib_protocol_t proto,
- u32 sw_if_index);
+extern void adj_glean_remove(ip_adjacency_t *adj);
extern void adj_mcast_remove(fib_protocol_t proto,
u32 sw_if_index);
extern void adj_midchain_teardown(ip_adjacency_t *adj);
return (NULL);
}
-static fib_entry_src_t *
+fib_entry_src_t *
fib_entry_src_find (const fib_entry_t *fib_entry,
fib_source_t source)
{
return (!0);
}
- else if (rpath->frp_flags & FIB_ROUTE_PATH_ATTACHED)
+ else if (rpath->frp_flags & FIB_ROUTE_PATH_ATTACHED ||
+ rpath->frp_flags & FIB_ROUTE_PATH_GLEAN)
{
return (!0);
}
extern const fib_entry_src_vft_t*fib_entry_src_get_vft(
const fib_entry_src_t *esrc);
+extern fib_entry_src_t * fib_entry_src_find (const fib_entry_t *fib_entry,
+ fib_source_t source);
extern u8* fib_entry_src_format(fib_entry_t *entry,
fib_source_t source,
u8* s);
fib_entry_src_interface_remove (fib_entry_src_t *src)
{
src->fes_pl = FIB_NODE_INDEX_INVALID;
+ ASSERT(src->u.interface.fesi_sibling == ~0);
}
-static void
-fib_entry_src_interface_path_swap (fib_entry_src_t *src,
- const fib_entry_t *entry,
- fib_path_list_flags_t pl_flags,
- const fib_route_path_t *paths)
+static int
+fib_entry_src_interface_update_glean (fib_entry_t *cover,
+ const fib_entry_t *local)
{
- fib_node_index_t fib_entry_index;
- ip_adjacency_t *adj;
+ fib_entry_src_t *src;
+ adj_index_t ai;
- fib_entry_index = fib_entry_get_index(entry);
- src->fes_pl = fib_path_list_create(pl_flags, paths);
+ src = fib_entry_src_find (cover, FIB_SOURCE_INTERFACE);
- /*
- * this is a hack to get the entry's prefix into the glean adjacency
- * so that it is available for fast retrieval in the switch path.
- */
- if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
+ if (NULL == src)
{
- adj_index_t ai;
+ /*
+ * The cover is not an interface source, no work
+ */
+ return 0;
+ }
- ai = fib_path_list_get_adj(src->fes_pl,
- fib_entry_get_default_chain_type(
- fib_entry_get(fib_entry_index)));
- if (INDEX_INVALID != ai)
- {
- adj = adj_get(ai);
+ ai = fib_path_list_get_adj(src->fes_pl,
+ fib_entry_get_default_chain_type(cover));
+
+ if (INDEX_INVALID != ai)
+ {
+ ip_adjacency_t *adj;
+
+ adj = adj_get(ai);
- if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+ if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+ {
+ /*
+ * the connected prefix will link to a glean on a non-p2p
+ * interface.
+ * Ensure we are updating with a host in the connected's subnet
+ */
+ if (fib_prefix_is_cover(&adj->sub_type.glean.rx_pfx,
+ &local->fe_prefix))
{
- /*
- * the connected prefix will link to a glean on a non-p2p
- * u.interface.
- */
- adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
+ adj->sub_type.glean.rx_pfx.fp_addr = local->fe_prefix.fp_addr;
+ return (1);
}
}
}
+
+ return (0);
+}
+
+static walk_rc_t
+fib_entry_src_interface_update_glean_walk (fib_entry_t *cover,
+ fib_node_index_t covered,
+ void *ctx)
+{
+ if (fib_entry_src_interface_update_glean(cover, fib_entry_get(covered)))
+ return (WALK_STOP);
+
+ return (WALK_CONTINUE);
+}
+
+static void
+fib_entry_src_interface_path_swap (fib_entry_src_t *src,
+ const fib_entry_t *entry,
+ fib_path_list_flags_t pl_flags,
+ const fib_route_path_t *paths)
+{
+ src->fes_pl = fib_path_list_create(pl_flags, paths);
}
/*
src->u.interface.fesi_sibling =
fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
+
+ fib_entry_src_interface_update_glean(cover, fib_entry);
}
return (!0);
fib_entry_cover_untrack(cover, src->u.interface.fesi_sibling);
src->u.interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+ src->u.interface.fesi_sibling = ~0;
+
+ fib_entry_cover_walk(cover,
+ fib_entry_src_interface_update_glean_walk,
+ NULL);
}
}
u32 fp_interface;
} attached_next_hop;
struct {
+ /**
+ * The Connected local address
+ */
+ fib_prefix_t fp_connected;
/**
* The interface
*/
ai = adj_glean_add_or_lock(nh_proto, link,
path->attached.fp_interface,
- NULL);
+ &path->attached.fp_connected);
dpo_set(dpo, DPO_ADJACENCY_GLEAN, vnet_link_to_dpo_proto(link), ai);
adj_unlock(ai);
}
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_UNREACH;
if (rpath->frp_flags & FIB_ROUTE_PATH_ICMP_PROHIBIT)
cfg_flags |= FIB_PATH_CFG_FLAG_ICMP_PROHIBIT;
+ if (rpath->frp_flags & FIB_ROUTE_PATH_GLEAN)
+ cfg_flags |= FIB_PATH_CFG_FLAG_GLEAN;
return (cfg_flags);
}
path->fp_type = FIB_PATH_TYPE_SPECIAL;
path->classify.fp_classify_table_id = rpath->frp_classify_table_id;
}
+ else if (path->fp_cfg_flags & FIB_PATH_CFG_FLAG_GLEAN)
+ {
+ path->fp_type = FIB_PATH_TYPE_ATTACHED;
+ path->attached.fp_interface = rpath->frp_sw_if_index;
+ path->attached.fp_connected = rpath->frp_connected;
+ }
else if (~0 != rpath->frp_sw_if_index)
{
if (ip46_address_is_zero(&rpath->frp_addr))
break;
}
case FIB_PATH_TYPE_DVR:
- dvr_dpo_add_or_lock(path->attached.fp_interface,
+ dvr_dpo_add_or_lock(path->dvr.fp_interface,
path->fp_nh_proto,
&path->fp_dpo);
break;
* The path pops a Psuedo Wire Control Word
*/
FIB_PATH_CFG_ATTRIBUTE_POP_PW_CW,
+ /**
+ * The path is a glean
+ */
+ FIB_PATH_CFG_ATTRIBUTE_GLEAN,
/**
* Marker. Add new types before this one, then update it.
*/
- FIB_PATH_CFG_ATTRIBUTE_LAST = FIB_PATH_CFG_ATTRIBUTE_POP_PW_CW,
+ FIB_PATH_CFG_ATTRIBUTE_LAST = FIB_PATH_CFG_ATTRIBUTE_GLEAN,
} __attribute__ ((packed)) fib_path_cfg_attribute_t;
/**
[FIB_PATH_CFG_ATTRIBUTE_INTF_RX] = "interface-rx", \
[FIB_PATH_CFG_ATTRIBUTE_RPF_ID] = "rpf-id", \
[FIB_PATH_CFG_ATTRIBUTE_DEAG_SRC] = "deag-src", \
- [FIB_PATH_CFG_ATTRIBUTE_POP_PW_CW] = "pop-pw-cw", \
+ [FIB_PATH_CFG_ATTRIBUTE_POP_PW_CW] = "pop-pw-cw", \
+ [FIB_PATH_CFG_ATTRIBUTE_GLEAN] = "glean", \
}
#define FOR_EACH_FIB_PATH_CFG_ATTRIBUTE(_item) \
FIB_PATH_CFG_FLAG_RPF_ID = (1 << FIB_PATH_CFG_ATTRIBUTE_RPF_ID),
FIB_PATH_CFG_FLAG_DEAG_SRC = (1 << FIB_PATH_CFG_ATTRIBUTE_DEAG_SRC),
FIB_PATH_CFG_FLAG_POP_PW_CW = (1 << FIB_PATH_CFG_ATTRIBUTE_POP_PW_CW),
+ FIB_PATH_CFG_FLAG_GLEAN = (1 << FIB_PATH_CFG_ATTRIBUTE_GLEAN),
} __attribute__ ((packed)) fib_path_cfg_flags_t;
typedef enum fib_path_format_flags_t_
--- /dev/null
+/*
+ * Copyright (c) 2020 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @brief FIB Source Address selection
+ *
+ * Use the FIB for source address selection on an interface
+ */
+
+#include <vnet/fib/fib_sas.h>
+#include <vnet/adj/adj_glean.h>
+#include <vnet/ip/ip6_link.h>
+
+
+bool
+fib_sas_get (u32 sw_if_index,
+ ip_address_family_t af,
+ const ip46_address_t *dst,
+ ip46_address_t *src)
+{
+ switch (af)
+ {
+ case AF_IP4:
+ if (dst)
+ return (fib_sas4_get(sw_if_index, &dst->ip4, &src->ip4));
+ else
+ return (fib_sas4_get(sw_if_index, NULL, &src->ip4));
+ case AF_IP6:
+ if (dst)
+ return (fib_sas6_get(sw_if_index, &dst->ip6, &src->ip6));
+ else
+ return (fib_sas6_get(sw_if_index, NULL, &src->ip6));
+ }
+ return (false);
+}
+
+bool
+fib_sas4_get (u32 sw_if_index,
+ const ip4_address_t *dst,
+ ip4_address_t *src)
+{
+ ip46_address_t d_tmp, *d_tmpp = NULL;
+ const ip46_address_t *s_tmp;
+ vnet_sw_interface_t *swif;
+
+ if (dst)
+ {
+ d_tmpp = &d_tmp;
+ d_tmp.ip4 = *dst;
+ }
+
+ /*
+ * If the interface is unnumbered then use the IP interface
+ */
+ swif = vnet_get_sw_interface (vnet_get_main(), sw_if_index);
+
+ if (swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+ sw_if_index = swif->unnumbered_sw_if_index;
+
+ /*
+ * get the source address from the glean adjacency
+ */
+ s_tmp = adj_glean_get_src (FIB_PROTOCOL_IP4, sw_if_index, d_tmpp);
+
+ if (NULL != s_tmp)
+ {
+ src->as_u32 = s_tmp->ip4.as_u32;
+ return (true);
+ }
+
+ return (false);
+}
+
+bool
+fib_sas6_get (u32 sw_if_index,
+ const ip6_address_t *dst,
+ ip6_address_t *src)
+{
+ ip46_address_t d_tmp, *d_tmpp = NULL;
+ const ip46_address_t *s_tmp;
+
+ if (dst)
+ {
+ d_tmpp = &d_tmp;
+ d_tmp.ip6 = *dst;
+ }
+
+ /*
+ * if the dst is v6 and link local, use the source link local
+ */
+ if (ip6_address_is_link_local_unicast (dst))
+ {
+ ip6_address_copy (src, ip6_get_link_local_address (sw_if_index));
+ return (true);
+ }
+
+ /*
+ * get the source address from the glean adjacency
+ */
+ s_tmp = adj_glean_get_src (FIB_PROTOCOL_IP6, sw_if_index, d_tmpp);
+
+ if (NULL != s_tmp)
+ {
+ ip6_address_copy(src, &s_tmp->ip6);
+ return (true);
+ }
+
+ return (false);
+}
--- /dev/null
+/*
+ * Copyright (c) 2020 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @brief FIB Source Address selection
+ *
+ * Use the FIB for source address selection on an interface
+ */
+
+#ifndef __FIB_SAS_H__
+#define __FIB_SAS_H__
+
+#include <vnet/fib/fib_types.h>
+#include <vnet/ip/ip_types.h>
+
+/**
+ * @brief Get a Source address to use in a packet being sent out
+ * an interface
+ *
+ * @param sw_if_index The interface on which the packet is to be sent
+ * @param af The address family of the packet
+ * @param dst The destination of the packet (can be NULL in which case any
+ * of the available address will be returned)
+ * @param src OUT the source address to use
+ *
+ * @return True if an address is available False (and src is unset) otherwise
+ */
+extern bool fib_sas_get (u32 sw_if_index,
+ ip_address_family_t af,
+ const ip46_address_t *dst,
+ ip46_address_t *src);
+
+/**
+ * @brief Get an IPv4 Source address to use in a packet being sent out
+ * an interface
+ *
+ * @param sw_if_index The interface on which the packet is to be sent
+ * @param dst The destination of the packet (can be NULL in which case any
+ * of the available address will be returned)
+ * @param src OUT the source address to use
+ *
+ * @return True if an address is available False (and src is unset) otherwise
+ */
+extern bool fib_sas4_get (u32 sw_if_index,
+ const ip4_address_t *dst,
+ ip4_address_t *src);
+
+/**
+ * @brief Get an IPv6 Source address to use in a packet being sent out
+ * an interface
+ *
+ * @param sw_if_index The interface on which the packet is to be sent
+ * @param dst The destination of the packet (can be NULL in which case any
+ * of the available address will be returned)
+ * @param src OUT the source address to use
+ *
+ * @return True if an address is available False (and src is unset) otherwise
+ */
+extern bool fib_sas6_get (u32 sw_if_index,
+ const ip6_address_t *dst,
+ ip6_address_t *src);
+
+#endif
(~0 == path->frp_sw_if_index) &&
(0 == ip46_address_cmp(&path->frp_addr, &prefix->fp_addr)))
{
- /* Prefix recurses via itse;f */
+ /* Prefix recurses via itself */
path->frp_flags |= FIB_ROUTE_PATH_DROP;
}
if (!(path->frp_flags & FIB_ROUTE_PATH_LOCAL) &&
path->frp_addr = prefix->fp_addr;
path->frp_flags |= FIB_ROUTE_PATH_ATTACHED;
}
+ else if ((*eflags & FIB_ENTRY_FLAG_CONNECTED) &&
+ !(*eflags & FIB_ENTRY_FLAG_LOCAL))
+ {
+ if (ip46_address_is_zero(&path->frp_addr))
+ {
+ path->frp_flags |= FIB_ROUTE_PATH_GLEAN;
+ fib_prefix_normalize(prefix, &path->frp_connected);
+ }
+ }
if (*eflags & FIB_ENTRY_FLAG_DROP)
{
path->frp_flags |= FIB_ROUTE_PATH_DROP;
return (0);
}
+void
+fib_prefix_normalize (const fib_prefix_t *p,
+ fib_prefix_t *out)
+{
+ fib_prefix_copy (out, p);
+
+ switch (p->fp_proto)
+ {
+ case FIB_PROTOCOL_IP4:
+ ip4_address_normalize(&out->fp_addr.ip4, out->fp_len);
+ break;
+ case FIB_PROTOCOL_IP6:
+ ip6_address_normalize(&out->fp_addr.ip6, out->fp_len);
+ break;
+ case FIB_PROTOCOL_MPLS:
+ break;
+ }
+}
+
u8 *
format_fib_prefix (u8 * s, va_list * args)
{
extern int fib_prefix_is_host(const fib_prefix_t *p);
extern u8 fib_prefix_get_host_length (fib_protocol_t proto);
+/**
+ * normalise a prefix (i.e. mask the host bits according to the
+ * prefix length)
+ */
+extern void fib_prefix_normalize(const fib_prefix_t *p,
+ fib_prefix_t *out);
+
/**
* \brief Host prefix from ip
*/
* Pop a Psuedo Wire Control Word
*/
FIB_ROUTE_PATH_POP_PW_CW = (1 << 18),
+ /**
+ * A path that resolves via a glean adjacency
+ */
+ FIB_ROUTE_PATH_GLEAN = (1 << 19),
} fib_route_path_flags_t;
/**
* Present in an mfib path list
*/
index_t frp_bier_imp;
+
+ /**
+ * Glean prefix on a glean path
+ */
+ fib_prefix_t frp_connected;
};
/**
#include <vnet/ip-neighbor/ip4_neighbor.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/util/throttle.h>
+#include <vnet/fib/fib_sas.h>
/** ARP throttling */
static throttle_t arp_throttle;
void
-ip4_neighbor_probe_dst (const ip_adjacency_t * adj, const ip4_address_t * dst)
+ip4_neighbor_probe_dst (u32 sw_if_index, const ip4_address_t * dst)
{
- ip_interface_address_t *ia;
- ip4_address_t *src;
+ ip4_address_t src;
+ adj_index_t ai;
- src = ip4_interface_address_matching_destination
- (&ip4_main,
- &adj->sub_type.nbr.next_hop.ip4, adj->rewrite_header.sw_if_index, &ia);
- if (!src)
- return;
+ /* any glean will do, it's just for the rewrite */
+ ai = adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index, NULL);
- ip4_neighbor_probe (vlib_get_main (), vnet_get_main (), adj, src, dst);
+ if (ADJ_INDEX_INVALID != ai && fib_sas4_get (sw_if_index, dst, &src))
+ ip4_neighbor_probe (vlib_get_main (),
+ vnet_get_main (), adj_get (ai), &src, dst);
}
void
vnet_hw_interface_t *hi = vnet_get_sup_hw_interface (vnm, sw_if_index);
ip4_main_t *i4m = &ip4_main;
u8 *rewrite, rewrite_len;
+ ip4_address_t tmp;
if (NULL == addr)
{
- ip4_main_t *i4m = &ip4_main;
- addr = ip4_interface_first_address (i4m, sw_if_index, 0);
+ fib_sas4_get (sw_if_index, NULL, &tmp);
+ addr = &tmp;
}
if (addr)
vlib_frame_t * frame, int is_glean)
{
vnet_main_t *vnm = vnet_get_main ();
- ip4_main_t *im = &ip4_main;
- ip_lookup_main_t *lm = &im->lookup_main;
u32 *from, *to_next_drop;
uword n_left_from, n_left_to_next_drop, next_index;
u32 thread_index = vm->thread_index;
/* resolve the packet's destination */
ip4_header_t *ip0 = vlib_buffer_get_current (p0);
resolve0 = ip0->dst_address;
- src0 = adj0->sub_type.glean.receive_addr.ip4;
+ src0 = adj0->sub_type.glean.rx_pfx.fp_addr.ip4;
}
else
{
/* resolve the incomplete adj */
resolve0 = adj0->sub_type.nbr.next_hop.ip4;
/* Src IP address in ARP header. */
- if (ip4_src_address_for_packet (lm, sw_if_index0, &src0))
+ if (!fib_sas4_get (sw_if_index0, &resolve0, &src0))
{
/* No source address available */
p0->error = node->errors[IP4_ARP_ERROR_NO_SOURCE_ADDRESS];
#include <vnet/ip/ip.h>
#include <vnet/ethernet/arp_packet.h>
-extern void ip4_neighbor_probe_dst (const ip_adjacency_t * adj,
+extern void ip4_neighbor_probe_dst (u32 sw_if_index,
const ip4_address_t * dst);
extern void ip4_neighbor_advertise (vlib_main_t * vm,
vnet_main_t * vnm,
#include <vnet/ip-neighbor/ip6_neighbor.h>
#include <vnet/util/throttle.h>
+#include <vnet/fib/fib_sas.h>
/** ND throttling */
static throttle_t nd_throttle;
void
-ip6_neighbor_probe_dst (const ip_adjacency_t * adj, const ip6_address_t * dst)
+ip6_neighbor_probe_dst (u32 sw_if_index, const ip6_address_t * dst)
{
- ip_interface_address_t *ia;
- ip6_address_t *src;
+ ip6_address_t src;
- src = ip6_interface_address_matching_destination
- (&ip6_main, dst, adj->rewrite_header.sw_if_index, &ia);
-
- if (!src)
- return;
-
- ip6_neighbor_probe (vlib_get_main (), vnet_get_main (), adj, src, dst);
+ if (fib_sas6_get (sw_if_index, dst, &src))
+ ip6_neighbor_probe (vlib_get_main (), vnet_get_main (),
+ sw_if_index, &src, dst);
}
void
* Choose source address based on destination lookup
* adjacency.
*/
- if (!ip6_src_address_for_packet (sw_if_index0,
- &ip0->dst_address, &src))
+ if (!fib_sas6_get (sw_if_index0, &ip0->dst_address, &src))
{
/* There is no address on the interface */
p0->error = node->errors[IP6_NBR_ERROR_NO_SOURCE_ADDRESS];
continue;
}
- b0 = ip6_neighbor_probe (vm, vnm, adj0, &src, &ip0->dst_address);
+ b0 = ip6_neighbor_probe (vm, vnm, sw_if_index0,
+ &src, &ip0->dst_address);
if (PREDICT_TRUE (NULL != b0))
{
u32 sw_if_index,
const ip6_address_t * addr);
-extern void ip6_neighbor_probe_dst (const ip_adjacency_t * adj,
+extern void ip6_neighbor_probe_dst (u32 sw_if_index,
const ip6_address_t * dst);
always_inline vlib_buffer_t *
ip6_neighbor_probe (vlib_main_t * vm,
vnet_main_t * vnm,
- const ip_adjacency_t * adj,
+ u32 sw_if_index,
const ip6_address_t * src, const ip6_address_t * dst)
{
icmp6_neighbor_solicitation_header_t *h0;
vnet_hw_interface_t *hw_if0;
+ const ip_adjacency_t *adj;
vlib_buffer_t *b0;
int bogus_length;
u32 bi0 = 0;
h0 = vlib_packet_template_get_packet
(vm, &ip6_neighbor_packet_template, &bi0);
if (!h0)
- return NULL;;
+ return NULL;
/* if the interface has been disabled for ip6, later steps to retrieve
* an adjacency will result in a segv.
*/
- if (!ip6_link_is_enabled (adj->rewrite_header.sw_if_index))
+ if (!ip6_link_is_enabled (sw_if_index))
return NULL;
b0 = vlib_get_buffer (vm, bi0);
- hw_if0 = vnet_get_sup_hw_interface (vnm, adj->rewrite_header.sw_if_index);
+ hw_if0 = vnet_get_sup_hw_interface (vnm, sw_if_index);
/*
* Destination address is a solicited node multicast address.
ASSERT (bogus_length == 0);
VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
- vnet_buffer (b0)->sw_if_index[VLIB_TX] = adj->rewrite_header.sw_if_index;
+ vnet_buffer (b0)->sw_if_index[VLIB_TX] = sw_if_index;
/* Use the link's mcast adj to ship the packet */
vnet_buffer (b0)->ip.adj_index[VLIB_TX] =
- ip6_link_get_mcast_adj (adj->rewrite_header.sw_if_index);
+ ip6_link_get_mcast_adj (sw_if_index);
adj = adj_get (vnet_buffer (b0)->ip.adj_index[VLIB_TX]);
b0->flags |= VNET_BUFFER_F_LOCALLY_ORIGINATED;
}
void
-ip_neighbor_probe_dst (const ip_adjacency_t * adj, const ip46_address_t * dst)
+ip_neighbor_probe_dst (u32 sw_if_index,
+ ip_address_family_t af, const ip46_address_t * dst)
{
- if (!vnet_sw_interface_is_admin_up (vnet_get_main (),
- adj->rewrite_header.sw_if_index))
+ if (!vnet_sw_interface_is_admin_up (vnet_get_main (), sw_if_index))
return;
- switch (adj->ia_nh_proto)
+ switch (af)
{
- case FIB_PROTOCOL_IP6:
- ip6_neighbor_probe_dst (adj, &dst->ip6);
+ case AF_IP6:
+ ip6_neighbor_probe_dst (sw_if_index, &dst->ip6);
break;
- case FIB_PROTOCOL_IP4:
- ip4_neighbor_probe_dst (adj, &dst->ip4);
- break;
- case FIB_PROTOCOL_MPLS:
- ASSERT (0);
+ case AF_IP4:
+ ip4_neighbor_probe_dst (sw_if_index, &dst->ip4);
break;
}
}
void
ip_neighbor_probe (const ip_adjacency_t * adj)
{
- ip_neighbor_probe_dst (adj, &adj->sub_type.nbr.next_hop);
+ ip_neighbor_probe_dst (adj->rewrite_header.sw_if_index,
+ ip_address_family_from_fib_proto (adj->ia_nh_proto),
+ &adj->sub_type.nbr.next_hop);
}
void
u32 sw_if_index, uword opaque)
{
ip_neighbor_t *ipn;
- adj_index_t ai;
IP_NEIGHBOR_DBG ("mac-change: %U",
format_vnet_sw_if_index_name, vnet_get_main (),
}));
/* *INDENT-ON* */
- ai = adj_glean_get (FIB_PROTOCOL_IP4, sw_if_index);
-
- if (ADJ_INDEX_INVALID != ai)
- adj_glean_update_rewrite (ai);
+ adj_glean_update_rewrite_itf (sw_if_index);
}
void
}
else
{
- adj_index_t ai;
-
- ai = adj_glean_get (ip_address_family_to_fib_proto (af),
- ip_neighbor_get_sw_if_index (ipn));
-
- if (ADJ_INDEX_INVALID != ai)
- ip_neighbor_probe_dst (adj_get (ai),
- &ip_addr_46 (&ipn->ipn_key->ipnk_ip));
+ ip_neighbor_probe_dst (ip_neighbor_get_sw_if_index (ipn),
+ af, &ip_addr_46 (&ipn->ipn_key->ipnk_ip));
ipn->ipn_n_probes++;
*wait = 1;
extern void ip_neighbor_update (vnet_main_t * vnm, adj_index_t ai);
extern void ip_neighbor_probe (const ip_adjacency_t * adj);
-extern void ip_neighbor_probe_dst (const ip_adjacency_t * adj,
+extern void ip_neighbor_probe_dst (u32 sw_if_index,
+ ip_address_family_t af,
const ip46_address_t * ip);
extern void ip_neighbor_mark (ip_address_family_t af);
return ip4_destination_matches_route (im, key, a, ia->address_length);
}
-always_inline int
-ip4_src_address_for_packet (ip_lookup_main_t * lm,
- u32 sw_if_index, ip4_address_t * src)
-{
- u32 if_add_index = lm->if_address_pool_index_by_sw_if_index[sw_if_index];
- if (PREDICT_TRUE (if_add_index != ~0))
- {
- ip_interface_address_t *if_add =
- pool_elt_at_index (lm->if_address_pool, if_add_index);
- ip4_address_t *if_ip = ip_interface_address_get_address (lm, if_add);
- *src = *if_ip;
- return 0;
- }
- else
- {
- src->as_u32 = 0;
- }
- return (!0);
-}
-
/* Find interface address which matches destination. */
always_inline ip4_address_t *
ip4_interface_address_matching_destination (ip4_main_t * im,
mhash_set (&lm->prefix_to_if_prefix_index, &key,
if_prefix - lm->if_prefix_pool, 0 /* old value */);
+ pfx_special.fp_len = a->address_length;
+ pfx_special.fp_addr.ip4.as_u32 = address->as_u32;
+
+ /* set the glean route for the prefix */
+ fib_table_entry_update_one_path (fib_index, &pfx_special,
+ FIB_SOURCE_INTERFACE,
+ (FIB_ENTRY_FLAG_CONNECTED |
+ FIB_ENTRY_FLAG_ATTACHED),
+ DPO_PROTO_IP4,
+ /* No next-hop address */
+ NULL,
+ sw_if_index,
+ /* invalid FIB index */
+ ~0,
+ 1,
+ /* no out-label stack */
+ NULL,
+ FIB_ROUTE_PATH_FLAG_NONE);
+
/* length <= 30 - add glean, drop first address, maybe drop bcast address */
if (a->address_length <= 30)
{
- pfx_special.fp_len = a->address_length;
- pfx_special.fp_addr.ip4.as_u32 = address->as_u32;
-
- /* set the glean route for the prefix */
- fib_table_entry_update_one_path (fib_index, &pfx_special,
- FIB_SOURCE_INTERFACE,
- (FIB_ENTRY_FLAG_CONNECTED |
- FIB_ENTRY_FLAG_ATTACHED),
- DPO_PROTO_IP4,
- /* No next-hop address */
- NULL,
- sw_if_index,
- /* invalid FIB index */
- ~0,
- 1,
- /* no out-label stack */
- NULL,
- FIB_ROUTE_PATH_FLAG_NONE);
-
/* set a drop route for the base address of the prefix */
pfx_special.fp_len = 32;
pfx_special.fp_addr.ip4.as_u32 =
if_prefix->ref_count -= 1;
/*
- * Routes need to be adjusted if:
- * - deleting last intf addr in prefix
- * - deleting intf addr used as default source address in glean adjacency
+ * Routes need to be adjusted if deleting last intf addr in prefix
*
* We're done now otherwise
*/
- if ((if_prefix->ref_count > 0) &&
- !pool_is_free_index (lm->if_address_pool, if_prefix->src_ia_index))
+ if (if_prefix->ref_count > 0)
return;
/* length <= 30, delete glean route, first address, last address */
if (address_length <= 30)
{
+ /* Less work to do in FIB if we remove the covered /32s first */
- /* remove glean route for prefix */
- pfx_special.fp_addr.ip4 = *address;
- pfx_special.fp_len = address_length;
- fib_table_entry_delete (fib_index, &pfx_special, FIB_SOURCE_INTERFACE);
-
- /* if no more intf addresses in prefix, remove other special routes */
- if (!if_prefix->ref_count)
- {
- /* first address in prefix */
- pfx_special.fp_addr.ip4.as_u32 =
- address->as_u32 & im->fib_masks[address_length];
- pfx_special.fp_len = 32;
+ /* first address in prefix */
+ pfx_special.fp_addr.ip4.as_u32 =
+ address->as_u32 & im->fib_masks[address_length];
+ pfx_special.fp_len = 32;
- if (pfx_special.fp_addr.ip4.as_u32 != address->as_u32)
- fib_table_entry_special_remove (fib_index,
- &pfx_special,
- FIB_SOURCE_INTERFACE);
+ if (pfx_special.fp_addr.ip4.as_u32 != address->as_u32)
+ fib_table_entry_special_remove (fib_index,
+ &pfx_special,
+ FIB_SOURCE_INTERFACE);
- /* prefix broadcast address */
- pfx_special.fp_addr.ip4.as_u32 =
- address->as_u32 | ~im->fib_masks[address_length];
- pfx_special.fp_len = 32;
+ /* prefix broadcast address */
+ pfx_special.fp_addr.ip4.as_u32 =
+ address->as_u32 | ~im->fib_masks[address_length];
+ pfx_special.fp_len = 32;
- if (pfx_special.fp_addr.ip4.as_u32 != address->as_u32)
- fib_table_entry_special_remove (fib_index,
- &pfx_special,
- FIB_SOURCE_INTERFACE);
- }
- else
- /* default source addr just got deleted, find another */
- {
- ip_interface_address_t *new_src_ia = NULL;
- ip4_address_t *new_src_addr = NULL;
-
- new_src_addr =
- ip4_interface_address_matching_destination
- (im, address, sw_if_index, &new_src_ia);
-
- if_prefix->src_ia_index = new_src_ia - lm->if_address_pool;
-
- pfx_special.fp_len = address_length;
- pfx_special.fp_addr.ip4 = *new_src_addr;
-
- /* set new glean route for the prefix */
- fib_table_entry_update_one_path (fib_index, &pfx_special,
- FIB_SOURCE_INTERFACE,
- (FIB_ENTRY_FLAG_CONNECTED |
- FIB_ENTRY_FLAG_ATTACHED),
- DPO_PROTO_IP4,
- /* No next-hop address */
- NULL,
- sw_if_index,
- /* invalid FIB index */
- ~0,
- 1,
- /* no out-label stack */
- NULL,
- FIB_ROUTE_PATH_FLAG_NONE);
- return;
- }
+ if (pfx_special.fp_addr.ip4.as_u32 != address->as_u32)
+ fib_table_entry_special_remove (fib_index,
+ &pfx_special,
+ FIB_SOURCE_INTERFACE);
}
- /* length == 31, delete attached route for the other address */
else if (address_length == 31)
{
+ /* length == 31, delete attached route for the other address */
pfx_special.fp_addr.ip4.as_u32 =
address->as_u32 ^ clib_host_to_net_u32(1);
fib_table_entry_delete (fib_index, &pfx_special, FIB_SOURCE_INTERFACE);
}
+ /* remove glean route for prefix */
+ pfx_special.fp_addr.ip4 = *address;
+ pfx_special.fp_len = address_length;
+ fib_table_entry_delete (fib_index, &pfx_special, FIB_SOURCE_INTERFACE);
+
mhash_unset (&lm->prefix_to_if_prefix_index, &key, 0 /* old_value */);
pool_put (lm->if_prefix_pool, if_prefix);
}
ip4_address_t * address, u32 address_length)
{
fib_prefix_t pfx = {
- .fp_len = address_length,
+ .fp_len = 32,
.fp_proto = FIB_PROTOCOL_IP4,
.fp_addr.ip4 = *address,
};
+ fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
+
ip4_del_interface_prefix_routes (im, sw_if_index, fib_index,
address, address_length);
-
- pfx.fp_len = 32;
- fib_table_entry_delete (fib_index, &pfx, FIB_SOURCE_INTERFACE);
}
#ifndef CLIB_MARCH_VARIANT
thread_index, adj_index0, 1,
vlib_buffer_length_in_chain (vm, b[0]) + rw_len0);
- if (is_midchain && adj0->sub_type.midchain.fixup_func)
- adj0->sub_type.midchain.fixup_func
- (vm, adj0, b[0], adj0->sub_type.midchain.fixup_data);
+ if (is_midchain)
+ adj_midchain_fixup (vm, adj0, b[0]);
if (is_mcast)
/* copy bytes from the IP address into the MAC rewrite */
return (il->il_mcast_adj);
}
-int
-ip6_src_address_for_packet (u32 sw_if_index,
- const ip6_address_t * dst, ip6_address_t * src)
-{
- ip_lookup_main_t *lm;
-
- lm = &ip6_main.lookup_main;
-
- if (ip6_address_is_link_local_unicast (dst))
- {
- ip6_address_copy (src, ip6_get_link_local_address (sw_if_index));
-
- return (!0);
- }
- else
- {
- u32 if_add_index =
- lm->if_address_pool_index_by_sw_if_index[sw_if_index];
- if (PREDICT_TRUE (if_add_index != ~0))
- {
- ip_interface_address_t *if_add =
- pool_elt_at_index (lm->if_address_pool, if_add_index);
- ip6_address_t *if_ip =
- ip_interface_address_get_address (lm, if_add);
- *src = *if_ip;
- return (!0);
- }
- }
-
- src->as_u64[0] = 0;
- src->as_u64[1] = 0;
-
- return (0);
-}
-
int
ip6_link_set_local_address (u32 sw_if_index, const ip6_address_t * address)
{
const ip6_address_t * address);
extern adj_index_t ip6_link_get_mcast_adj (u32 sw_if_index);
-extern int
-ip6_src_address_for_packet (u32 sw_if_index,
- const ip6_address_t * dst, ip6_address_t * src);
-
/**
* Delegates for the interfaces
*
FINISH;
}
-static void *vl_api_ip_table_dump_t_print
- (vl_api_ip_table_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: ip_table_dump ");
-
- FINISH;
-}
-
-static void *vl_api_ip_route_dump_t_print
- (vl_api_ip_route_dump_t * mp, void *handle)
-{
- u8 *s;
-
- s = format (0, "SCRIPT: ip_route_dump ");
-
- FINISH;
-}
-
static void *vl_api_classify_table_ids_t_print
(vl_api_classify_table_ids_t * mp, void *handle)
{
_(GET_FIRST_MSG_ID, get_first_msg_id) \
_(IOAM_ENABLE, ioam_enable) \
_(IOAM_DISABLE, ioam_disable) \
-_(IP_TABLE_DUMP, ip_table_dump) \
-_(IP_ROUTE_DUMP, ip_route_dump) \
_(FEATURE_ENABLE_DISABLE, feature_enable_disable) \
_(FEATURE_GSO_ENABLE_DISABLE, feature_gso_enable_disable) \
_(SW_INTERFACE_TAG_ADD_DEL, sw_interface_tag_add_del) \
from framework import VppTestCase, VppTestRunner
from vpp_neighbor import VppNeighbor, find_nbr
from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, \
- VppIpTable, DpoProto, FibPathType
+ VppIpTable, DpoProto, FibPathType, VppIpInterfaceAddress
from vpp_papi import VppEnum
from vpp_ip import VppIpPuntRedirect
self.pg1.unconfig_ip4()
self.pg1.set_table_ip4(0)
+ def test_glean_src_select(self):
+ """ Multi Connecteds """
+
+ #
+ # configure multiple connected subnets on an interface
+ # and ensure that ARP requests for hosts on those subnets
+ # pick up the correct source address
+ #
+ conn1 = VppIpInterfaceAddress(self, self.pg1,
+ "10.0.0.1", 24).add_vpp_config()
+ conn2 = VppIpInterfaceAddress(self, self.pg1,
+ "10.0.1.1", 24).add_vpp_config()
+
+ p1 = (Ether(src=self.pg0.remote_mac,
+ dst=self.pg0.local_mac) /
+ IP(src=self.pg1.remote_ip4,
+ dst="10.0.0.128") /
+ Raw(b'0x5' * 100))
+
+ rxs = self.send_and_expect(self.pg0, [p1], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.0.1",
+ "10.0.0.128")
+
+ p2 = (Ether(src=self.pg0.remote_mac,
+ dst=self.pg0.local_mac) /
+ IP(src=self.pg1.remote_ip4,
+ dst="10.0.1.128") /
+ Raw(b'0x5' * 100))
+
+ rxs = self.send_and_expect(self.pg0, [p2], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.1.1",
+ "10.0.1.128")
+
+ #
+ # add a local address in the same subnet
+ # the source addresses are equivalent. VPP happens to
+ # choose the last one that was added
+ conn3 = VppIpInterfaceAddress(self, self.pg1,
+ "10.0.1.2", 24).add_vpp_config()
+
+ rxs = self.send_and_expect(self.pg0, [p2], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.1.2",
+ "10.0.1.128")
+
+ #
+ # remove
+ #
+ conn3.remove_vpp_config()
+ rxs = self.send_and_expect(self.pg0, [p2], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.1.1",
+ "10.0.1.128")
+
+ #
+ # add back, this time remove the first one
+ #
+ conn3 = VppIpInterfaceAddress(self, self.pg1,
+ "10.0.1.2", 24).add_vpp_config()
+
+ rxs = self.send_and_expect(self.pg0, [p2], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.1.2",
+ "10.0.1.128")
+
+ conn1.remove_vpp_config()
+ rxs = self.send_and_expect(self.pg0, [p2], self.pg1)
+ for rx in rxs:
+ self.verify_arp_req(rx,
+ self.pg1.local_mac,
+ "10.0.1.2",
+ "10.0.1.128")
+
+ # cleanup
+ conn3.remove_vpp_config()
+ conn2.remove_vpp_config()
+
class NeighborStatsTestCase(VppTestCase):
""" ARP/ND Counters """
from framework import VppTestCase
from util import ppp
+from vpp_ip_route import VppIpInterfaceAddress
+from vpp_neighbor import VppNeighbor
""" TestPing is a subclass of VPPTestCase classes.
def show_commands_at_teardown(self):
self.logger.info(self.vapi.cli("show hardware"))
+ def verify_ping_request(self, p, src, dst, seq):
+ ip = p[IP]
+ self.assertEqual(ip.version, 4)
+ self.assertEqual(ip.flags, 0)
+ self.assertEqual(ip.src, src)
+ self.assertEqual(ip.dst, dst)
+ self.assertEqual(ip.proto, 1)
+ self.assertEqual(len(ip.options), 0)
+ self.assertGreaterEqual(ip.ttl, 254)
+ icmp = p[ICMP]
+ self.assertEqual(icmp.type, 8)
+ self.assertEqual(icmp.code, 0)
+ self.assertEqual(icmp.seq, seq)
+ return icmp
+
def test_ping_basic(self):
""" basic ping test """
try:
icmp_id = None
icmp_seq = 1
for p in out:
- ip = p[IP]
- self.assertEqual(ip.version, 4)
- self.assertEqual(ip.flags, 0)
- self.assertEqual(ip.src, self.pg1.local_ip4)
- self.assertEqual(ip.dst, self.pg1.remote_ip4)
- self.assertEqual(ip.proto, 1)
- self.assertEqual(len(ip.options), 0)
- self.assertGreaterEqual(ip.ttl, 254)
- icmp = p[ICMP]
- self.assertEqual(icmp.type, 8)
- self.assertEqual(icmp.code, 0)
- self.assertEqual(icmp.seq, icmp_seq)
+ icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+ self.pg1.remote_ip4, icmp_seq)
icmp_seq = icmp_seq + 1
if icmp_id is None:
icmp_id = icmp.id
icmp_seq = 1
count = 0
for p in out:
- ip = p[IP]
- self.assertEqual(ip.version, 4)
- self.assertEqual(ip.flags, 0)
- self.assertEqual(ip.src, self.pg1.local_ip4)
- self.assertEqual(ip.dst, self.pg1.remote_ip4)
- self.assertEqual(ip.proto, 1)
- self.assertEqual(len(ip.options), 0)
- self.assertGreaterEqual(ip.ttl, 254)
- icmp = p[ICMP]
- self.assertEqual(icmp.type, 8)
- self.assertEqual(icmp.code, 0)
- self.assertEqual(icmp.seq, icmp_seq)
+ icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+ self.pg1.remote_ip4, icmp_seq)
count = count + 1
if count >= 3:
icmp_seq = icmp_seq + 1
self.assertEqual(icmp.id, icmp_id)
finally:
self.vapi.cli("show error")
+
+ def test_ping_src(self):
+ """ ping with source address set """
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+ self.logger.info(self.vapi.cli("show ip4 neighbors"))
+ self.logger.info(self.vapi.cli("show ip6 neighbors"))
+
+ nbr_addr = "10.0.0.2"
+ VppIpInterfaceAddress(self, self.pg1, "10.0.0.1", 24).add_vpp_config()
+ VppNeighbor(self, self.pg1.sw_if_index,
+ "00:11:22:33:44:55",
+ nbr_addr).add_vpp_config()
+
+ ping_cmd = "ping %s interval 0.01 repeat 3" % self.pg1.remote_ip4
+ ret = self.vapi.cli(ping_cmd)
+ out = self.pg1.get_capture(3)
+ icmp_seq = 1
+ for p in out:
+ icmp = self.verify_ping_request(p, self.pg1.local_ip4,
+ self.pg1.remote_ip4, icmp_seq)
+ icmp_seq = icmp_seq + 1
+
+ self.pg_enable_capture(self.pg_interfaces)
+ self.pg_start()
+ ping_cmd = "ping %s interval 0.01 repeat 3" % nbr_addr
+ ret = self.vapi.cli(ping_cmd)
+ out = self.pg1.get_capture(3)
+ icmp_seq = 1
+ for p in out:
+ icmp = self.verify_ping_request(p, "10.0.0.1", nbr_addr, icmp_seq)
+ icmp_seq = icmp_seq + 1
Code Review / vpp.git / commitdiff