*/
#include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry_track.h>
#include <vnet/fib/ip6_fib.h>
#include <vnet/adj/adj.h>
#include <vppinfra/crc32.h>
*/
+/*
+ * Save user-assigned MAP domain names ("tags") in a vector of
+ * extra domain information.
+ */
+static void
+map_save_extras (u32 map_domain_index, u8 * tag)
+{
+ map_main_t *mm = &map_main;
+ map_domain_extra_t *de;
+
+ if (map_domain_index == ~0)
+ return;
+
+ vec_validate (mm->domain_extras, map_domain_index);
+ de = vec_elt_at_index (mm->domain_extras, map_domain_index);
+ clib_memset (de, 0, sizeof (*de));
+
+ if (!tag)
+ return;
+
+ de->tag = vec_dup (tag);
+}
+
+
+static void
+map_free_extras (u32 map_domain_index)
+{
+ map_main_t *mm = &map_main;
+ map_domain_extra_t *de;
+ u8 *tag;
+
+ if (map_domain_index == ~0)
+ return;
+
+ de = vec_elt_at_index (mm->domain_extras, map_domain_index);
+ tag = de->tag;
+ if (!tag)
+ return;
+
+ vec_free (tag);
+ de->tag = 0;
+}
+
int
map_create_domain (ip4_address_t * ip4_prefix,
u8 ip6_src_len,
u8 ea_bits_len,
u8 psid_offset,
- u8 psid_length, u32 * map_domain_index, u16 mtu, u8 flags)
+ u8 psid_length,
+ u32 * map_domain_index, u16 mtu, u8 flags, u8 * tag)
{
u8 suffix_len, suffix_shift;
map_main_t *mm = &map_main;
d->psid_mask = (1 << d->psid_length) - 1;
d->ea_shift = 64 - ip6_prefix_len - suffix_len - d->psid_length;
+ /* Save a user-assigned MAP domain name if provided. */
+ if (tag)
+ map_save_extras (*map_domain_index, tag);
+
/* MAP longest match lookup table (input feature / FIB) */
mm->ip4_prefix_tbl->add (mm->ip4_prefix_tbl, &d->ip4_prefix,
d->ip4_prefix_len, *map_domain_index);
mm->ip6_src_prefix_tbl->delete (mm->ip6_src_prefix_tbl, &d->ip6_src,
d->ip6_src_len);
+ /* Release user-assigned MAP domain name. */
+ map_free_extras (map_domain_index);
+
/* Deleting rules */
if (d->rules)
clib_mem_free (d->rules);
#ifdef MAP_SKIP_IP6_LOOKUP
/**
- * Pre-resolvd per-protocol global next-hops
+ * Pre-resolved per-protocol global next-hops
*/
map_main_pre_resolved_t pre_resolved[FIB_PROTOCOL_MAX];
.fp_addr = *addr,
};
- pr->fei = fib_table_entry_special_add (0, // default fib
- &pfx,
- FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
- pr->sibling = fib_entry_child_add (pr->fei, FIB_NODE_TYPE_MAP_E, proto);
+ pr->fei = fib_entry_track (0, // default fib
+ &pfx, FIB_NODE_TYPE_MAP_E, proto, &pr->sibling);
map_stack (pr);
}
map_fib_unresolve (map_main_pre_resolved_t * pr,
fib_protocol_t proto, u8 len, const ip46_address_t * addr)
{
- fib_prefix_t pfx = {
- .fp_proto = proto,
- .fp_len = len,
- .fp_addr = *addr,
- };
-
- fib_entry_child_remove (pr->fei, pr->sibling);
+ if (pr->fei != FIB_NODE_INDEX_INVALID)
+ {
+ fib_entry_untrack (pr->fei, pr->sibling);
- fib_table_entry_special_remove (0, // default fib
- &pfx, FIB_SOURCE_RR);
- dpo_reset (&pr->dpo);
+ dpo_reset (&pr->dpo);
- pr->fei = FIB_NODE_INDEX_INVALID;
- pr->sibling = FIB_NODE_INDEX_INVALID;
+ pr->fei = FIB_NODE_INDEX_INVALID;
+ pr->sibling = FIB_NODE_INDEX_INVALID;
+ }
}
void
u32 ea_bits_len = 0, psid_offset = 0, psid_length = 0;
u32 mtu = 0;
u8 flags = 0;
+ u8 *tag = 0;
ip6_src_len = 128;
clib_error_t *error = NULL;
num_m_args++;
else if (unformat (line_input, "mtu %d", &mtu))
num_m_args++;
+ else if (unformat (line_input, "tag %v", &tag))
+ ;
else
{
error = clib_error_return (0, "unknown input `%U'",
map_create_domain (&ip4_prefix, ip4_prefix_len,
&ip6_prefix, ip6_prefix_len, &ip6_src, ip6_src_len,
ea_bits_len, psid_offset, psid_length, &map_domain_index,
- mtu, flags);
+ mtu, flags, tag);
done:
unformat_free (line_input);
bool counters = va_arg (*args, int);
map_main_t *mm = &map_main;
ip6_address_t ip6_prefix;
+ u32 map_domain_index = d - mm->domains;
+ map_domain_extra_t *de;
if (d->rules)
clib_memset (&ip6_prefix, 0, sizeof (ip6_prefix));
else
ip6_prefix = d->ip6_prefix;
+ de = vec_elt_at_index (mm->domain_extras, map_domain_index);
+
s = format (s,
- "[%d] ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d ea-bits-len %d "
- "psid-offset %d psid-len %d mtu %d %s",
- d - mm->domains,
+ "[%d] tag {%v} ip4-pfx %U/%d ip6-pfx %U/%d ip6-src %U/%d "
+ "ea-bits-len %d psid-offset %d psid-len %d mtu %d %s",
+ map_domain_index, de->tag,
format_ip4_address, &d->ip4_prefix, d->ip4_prefix_len,
format_ip6_address, &ip6_prefix, d->ip6_prefix_len,
format_ip6_address, &d->ip6_src, d->ip6_src_len,
map_domain_counter_lock (mm);
vlib_counter_t v;
vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_TX],
- d - mm->domains, &v);
+ map_domain_index, &v);
s = format (s, " TX: %lld/%lld", v.packets, v.bytes);
vlib_get_combined_counter (&mm->domain_counters[MAP_DOMAIN_COUNTER_RX],
- d - mm->domains, &v);
+ map_domain_index, &v);
s = format (s, " RX: %lld/%lld", v.packets, v.bytes);
map_domain_counter_unlock (mm);
}
vlib_node_t *n = vlib_get_node (vm, node_index);
u32 ci;
- ci = vlib_error_get_code (e);
+ ci = vlib_error_get_code (&vm->node_main, e);
ASSERT (ci < n->n_errors);
ci += n->error_heap_index;
?*/
VLIB_CLI_COMMAND(map_add_domain_command, static) = {
.path = "map add domain",
- .short_help = "map add domain ip4-pfx <ip4-pfx> ip6-pfx <ip6-pfx> "
+ .short_help = "map add domain [tag <tag>] ip4-pfx <ip4-pfx> "
+ "ip6-pfx <ip6-pfx> "
"ip6-src <ip6-pfx> ea-bits-len <n> psid-offset <n> psid-len <n> "
"[map-t] [mtu <mtu>]",
.function = map_add_domain_command_fn,
VLIB_PLUGIN_REGISTER() = {
.version = VPP_BUILD_VER,
- .description = "Mapping of address and port (MAP)",
+ .description = "Mapping of Address and Port (MAP)",
};
/* *INDENT-ON* */
fib_node_register_type (FIB_NODE_TYPE_MAP_E, &map_vft);
#endif
- /* Create empty domain that's used in case of error */
- map_domain_t *d;
- pool_get_aligned (mm->domains, d, CLIB_CACHE_LINE_BYTES);
- memset (d, 0, sizeof (*d));
- d->ip6_src_len = 64;
-
/* LPM lookup tables */
mm->ip4_prefix_tbl = lpm_table_init (LPM_TYPE_KEY32);
mm->ip6_prefix_tbl = lpm_table_init (LPM_TYPE_KEY128);
mm->ip6_src_prefix_tbl = lpm_table_init (LPM_TYPE_KEY128);
+ mm->bm_trans_enabled_by_sw_if = 0;
+ mm->bm_encap_enabled_by_sw_if = 0;
+
error = map_plugin_api_hookup (vm);
return error;
Code Review / vpp.git / blobdiff