*/
udp_encap_t *udp_encap_pool;
+/**
+ * Stats for each UDP encap object
+ */
+vlib_combined_counter_main_t udp_encap_counters;
+
static udp_encap_t *
udp_encap_get_w_id (u32 id)
{
{
u8 pfx_len = 0;
- pool_get (udp_encap_pool, ue);
+ pool_get_aligned (udp_encap_pool, ue, CLIB_CACHE_LINE_BYTES);
uei = ue - udp_encap_pool;
+ vlib_validate_combined_counter (&(udp_encap_counters), uei);
+ vlib_zero_combined_counter (&(udp_encap_counters), uei);
+
hash_set (udp_encap_db, id, uei);
fib_node_init (&ue->ue_fib_node, FIB_NODE_TYPE_UDP_ENCAP);
index_t uei = va_arg (*args, index_t);
u32 indent = va_arg (*args, u32);
u32 details = va_arg (*args, u32);
+ vlib_counter_t to;
udp_encap_t *ue;
ue = udp_encap_get (uei);
// FIXME
- s = format (s, "udp-ecap:[%d]: id:%d ip-fib-index:%d",
+ s = format (s, "udp-ecap:[%d]: id:%d ip-fib-index:%d ",
uei, ue->ue_id, ue->ue_fib_index);
if (FIB_PROTOCOL_IP4 == ue->ue_ip_proto)
{
clib_net_to_host_u16 (ue->ue_hdrs.ip6.ue_udp.src_port),
clib_net_to_host_u16 (ue->ue_hdrs.ip6.ue_udp.dst_port));
}
+ vlib_get_combined_counter (&(udp_encap_counters), uei, &to);
+ s = format (s, " to:[%Ld:%Ld]]", to.packets, to.bytes);
+
if (details)
{
s = format (s, " locks:%d", ue->ue_fib_node.fn_locks);
return (s);
}
+void
+udp_encap_get_stats (index_t uei, u64 * packets, u64 * bytes)
+{
+ vlib_counter_t to;
+
+ vlib_get_combined_counter (&(udp_encap_counters), uei, &to);
+
+ *packets = to.packets;
+ *bytes = to.bytes;
+}
+
static u8 *
format_udp_encap_dpo (u8 * s, va_list * args)
{
static udp_encap_t *
udp_encap_from_fib_node (fib_node_t * node)
{
-#if (CLIB_DEBUG > 0)
ASSERT (FIB_NODE_TYPE_UDP_ENCAP == node->fn_type);
-#endif
return ((udp_encap_t *) (((char *) node) -
STRUCT_OFFSET_OF (udp_encap_t, ue_fib_node)));
}
NULL,
};
+const static char *const udp4_encap_bier_nodes[] = {
+ "udp4-encap",
+ NULL,
+};
+
const static char *const udp6_encap_ip4_nodes[] = {
"udp6-encap",
NULL,
NULL,
};
+const static char *const udp6_encap_bier_nodes[] = {
+ "udp6-encap",
+ NULL,
+};
+
const static char *const *const udp4_encap_nodes[DPO_PROTO_NUM] = {
[DPO_PROTO_IP4] = udp4_encap_ip4_nodes,
[DPO_PROTO_IP6] = udp4_encap_ip6_nodes,
[DPO_PROTO_MPLS] = udp4_encap_mpls_nodes,
+ [DPO_PROTO_BIER] = udp4_encap_bier_nodes,
};
const static char *const *const udp6_encap_nodes[DPO_PROTO_NUM] = {
[DPO_PROTO_IP4] = udp6_encap_ip4_nodes,
[DPO_PROTO_IP6] = udp6_encap_ip6_nodes,
[DPO_PROTO_MPLS] = udp6_encap_mpls_nodes,
+ [DPO_PROTO_BIER] = udp6_encap_bier_nodes,
};
/*
.dv_lock = udp_encap_dpo_lock,
.dv_unlock = udp_encap_dpo_unlock,
.dv_format = format_udp_encap_dpo,
- //.dv_mem_show = replicate_mem_show,
};
clib_error_t *
return error;
}
+void
+udp_encap_walk (udp_encap_walk_cb_t cb, void *ctx)
+{
+ index_t uei;
+
+ /* *INDENT-OFF* */
+ pool_foreach_index(uei, udp_encap_pool,
+ ({
+ if (!cb(uei, ctx))
+ break;
+ }));
+ /* *INDENT-ON* */
+}
+
clib_error_t *
udp_encap_show (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
if (unformat (input, "%d", &ue_id))
;
+ else
+ return clib_error_return (0, "unknown input `%U'",
+ format_unformat_error, input);
}
if (~0 == ue_id)