#include <vnet/mfib/mfib_table.h>
#include <vnet/mfib/mfib_entry.h>
-static const mfib_prefix_t ip4_specials[] = {
+static const mfib_prefix_t all_zeros =
+{
+ .fp_proto = FIB_PROTOCOL_IP4,
+};
+static const mfib_prefix_t ip4_specials[] =
+{
+ /* ALL prefixes are in network order */
{
- /* (*,*)/0 */
- .fp_src_addr = {
- .ip4.data_u32 = 0,
+ /* (*,224.0.0.1)/32 - all hosts */
+ .fp_grp_addr = {
+ .ip4.data_u32 = 0x010000e0,
},
+ .fp_len = 32,
+ .fp_proto = FIB_PROTOCOL_IP4,
+ },
+ {
+ /* (*,224.0.0.2)/32 - all routers */
.fp_grp_addr = {
- .ip4.data_u32 = 0,
+ .ip4.data_u32 = 0x020000e0,
},
- .fp_len = 0,
+ .fp_len = 32,
.fp_proto = FIB_PROTOCOL_IP4,
},
};
mfib_table_t *mfib_table;
pool_get_aligned(ip4_main.mfibs, mfib_table, CLIB_CACHE_LINE_BYTES);
- memset(mfib_table, 0, sizeof(*mfib_table));
+ clib_memset(mfib_table, 0, sizeof(*mfib_table));
mfib_table->mft_proto = FIB_PROTOCOL_IP4;
mfib_table->mft_index =
mfib_table_lock(mfib_table->mft_index, FIB_PROTOCOL_IP4, src);
/*
- * add the special entries into the new FIB
+ * add the default route into the new FIB
*/
+ mfib_table_entry_update(mfib_table->mft_index,
+ &all_zeros,
+ MFIB_SOURCE_DEFAULT_ROUTE,
+ MFIB_RPF_ID_NONE,
+ MFIB_ENTRY_FLAG_DROP);
+
+ const fib_route_path_t path = {
+ .frp_proto = DPO_PROTO_IP4,
+ .frp_addr = zero_addr,
+ .frp_sw_if_index = ~0,
+ .frp_fib_index = ~0,
+ .frp_weight = 1,
+ .frp_flags = FIB_ROUTE_PATH_LOCAL,
+ .frp_mitf_flags = MFIB_ITF_FLAG_FORWARD,
+ };
int ii;
for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
{
- mfib_prefix_t prefix = ip4_specials[ii];
-
- prefix.fp_src_addr.ip4.data_u32 =
- clib_host_to_net_u32(prefix.fp_src_addr.ip4.data_u32);
- prefix.fp_grp_addr.ip4.data_u32 =
- clib_host_to_net_u32(prefix.fp_grp_addr.ip4.data_u32);
-
- mfib_table_entry_update(mfib_table->mft_index,
- &prefix,
- MFIB_SOURCE_DEFAULT_ROUTE,
- MFIB_RPF_ID_NONE,
- MFIB_ENTRY_FLAG_DROP);
+ mfib_table_entry_path_update(mfib_table->mft_index,
+ &ip4_specials[ii],
+ MFIB_SOURCE_SPECIAL,
+ &path);
}
return (mfib_table->mft_index);
/*
* remove all the specials we added when the table was created.
*/
+ mfib_table_entry_delete(mfib_table->mft_index,
+ &all_zeros,
+ MFIB_SOURCE_DEFAULT_ROUTE);
+
for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
{
- fib_node_index_t mfei;
- mfib_prefix_t prefix = ip4_specials[ii];
-
- prefix.fp_src_addr.ip4.data_u32 =
- clib_host_to_net_u32(prefix.fp_src_addr.ip4.data_u32);
- prefix.fp_grp_addr.ip4.data_u32 =
- clib_host_to_net_u32(prefix.fp_grp_addr.ip4.data_u32);
-
- mfei = mfib_table_lookup(mfib_table->mft_index, &prefix);
- mfib_table_entry_delete_index(mfei, MFIB_SOURCE_DEFAULT_ROUTE);
+ mfib_table_entry_delete(mfib_table->mft_index,
+ &ip4_specials[ii],
+ MFIB_SOURCE_SPECIAL);
}
/*
pool_put(ip4_main.mfibs, mfib_table);
}
+void
+ip4_mfib_interface_enable_disable (u32 sw_if_index, int is_enable)
+{
+ const fib_route_path_t path = {
+ .frp_proto = DPO_PROTO_IP4,
+ .frp_addr = zero_addr,
+ .frp_sw_if_index = sw_if_index,
+ .frp_fib_index = ~0,
+ .frp_weight = 1,
+ .frp_mitf_flags = MFIB_ITF_FLAG_ACCEPT,
+ };
+ u32 mfib_index;
+ int ii;
+
+ vec_validate (ip4_main.mfib_index_by_sw_if_index, sw_if_index);
+ mfib_index = ip4_mfib_table_get_index_for_sw_if_index(sw_if_index);
+
+ for (ii = 0; ii < ARRAY_LEN(ip4_specials); ii++)
+ {
+ if (is_enable)
+ {
+ mfib_table_entry_path_update(mfib_index,
+ &ip4_specials[ii],
+ MFIB_SOURCE_SPECIAL,
+ &path);
+ }
+ else
+ {
+ mfib_table_entry_path_remove(mfib_index,
+ &ip4_specials[ii],
+ MFIB_SOURCE_SPECIAL,
+ &path);
+ }
+ }
+}
+
u32
ip4_mfib_table_find_or_create_and_lock (u32 table_id,
mfib_source_t src)
}
}
- for (mask_len = 32; mask_len >= 0; mask_len--)
+ for (mask_len = (len == 64 ? 32 : len); mask_len >= 0; mask_len--)
{
hash = mfib->fib_entry_by_dst_address[mask_len];
IP4_MFIB_MK_GRP_KEY(grp, mask_len, key);
return (FIB_NODE_INDEX_INVALID);
}
+fib_node_index_t
+ip4_mfib_table_get_less_specific (const ip4_mfib_t *mfib,
+ const ip4_address_t *src,
+ const ip4_address_t *grp,
+ u32 len)
+{
+ u32 mask_len;
+
+ /*
+ * in the absence of a tree structure for the table that allows for an O(1)
+ * parent get, a cheeky way to find the cover is to LPM for the prefix with
+ * mask-1.
+ * there should always be a cover, though it may be the default route. the
+ * default route's cover is the default route.
+ */
+ if (len == 64)
+ {
+ /* go from (S,G) to (*,G*) */
+ mask_len = 32;
+ }
+ else if (len != 0)
+ {
+ mask_len = len - 1;
+ }
+ else
+ {
+ mask_len = len;
+ }
+
+ return (ip4_mfib_table_lookup(mfib, src, grp, mask_len));
+}
+
void
ip4_mfib_table_entry_insert (ip4_mfib_t *mfib,
const ip4_address_t *grp,
if (NULL == result)
{
/*
- * removing a non-existant entry. i'll allow it.
+ * removing a non-existent entry. i'll allow it.
*/
}
else
total_memory += mfib_size;
}));
- s = format(s, "%=30s %=6d %=8ld\n",
+ s = format(s, "%=30s %=6d %=12ld\n",
"IPv4 multicast",
pool_elts(ip4_main.mfibs), total_memory);
}
else if (unformat (input, "%U/%d", unformat_ip4_address, &grp, &mask))
{
- memset(&src, 0, sizeof(src));
+ clib_memset(&src, 0, sizeof(src));
matching = 1;
}
else if (unformat (input, "%U", unformat_ip4_address, &grp))
{
- memset(&src, 0, sizeof(src));
+ clib_memset(&src, 0, sizeof(src));
matching = 1;
mask = 32;
}
continue;
}
- vlib_cli_output (vm, "%U, fib_index %d",
+ vlib_cli_output (vm, "%U, fib_index:%d flags:%U",
format_mfib_table_name, mfib->index, FIB_PROTOCOL_IP4,
- mfib->index);
+ mfib->index,
+ format_mfib_table_flags, mfib_table->mft_flags);
/* Show summary? */
if (! verbose)
Code Review / vpp.git / blobdiff