X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fudp%2Fudp_encap.c;h=8005fa57e706cb5c720cd69b0ff173d25495a609;hb=43b1f44571fd6989d6442723433cad28a5ab244f;hp=98b824ba86650ef56f3b02fbc9b49213ed8dfbda;hpb=810086d8fd08445919ae03bf36161037e53a712a;p=vpp.git

diff --git a/src/vnet/udp/udp_encap.c b/src/vnet/udp/udp_encap.c
index 98b824ba866..8005fa57e70 100644
--- a/src/vnet/udp/udp_encap.c
+++ b/src/vnet/udp/udp_encap.c
@@ -33,6 +33,11 @@ uword *udp_encap_db;
  */
 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)
 {
@@ -79,6 +84,9 @@ udp_encap_add_and_lock (u32 id,
       pool_get (udp_encap_pool, ue);
       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);
@@ -258,12 +266,13 @@ format_udp_encap_i (u8 * s, va_list * args)
   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)
     {
@@ -285,6 +294,9 @@ format_udp_encap_i (u8 * s, va_list * args)
 		  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);
@@ -296,6 +308,17 @@ format_udp_encap_i (u8 * s, va_list * args)
   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)
 {
@@ -325,9 +348,7 @@ format_udp_encap (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)));
 }
@@ -394,6 +415,11 @@ const static char *const udp4_encap_mpls_nodes[] = {
   NULL,
 };
 
+const static char *const udp4_encap_bier_nodes[] = {
+  "udp4-encap",
+  NULL,
+};
+
 const static char *const udp6_encap_ip4_nodes[] = {
   "udp6-encap",
   NULL,
@@ -409,16 +435,23 @@ const static char *const udp6_encap_mpls_nodes[] = {
   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,
 };
 
 /*
@@ -435,7 +468,6 @@ const static dpo_vft_t udp_encap_dpo_vft = {
   .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 *
@@ -559,6 +591,20 @@ done:
   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)
@@ -572,6 +618,9 @@ udp_encap_show (vlib_main_t * vm,
     {
       if (unformat (input, "%d", &ue_id))
 	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
     }
 
   if (~0 == ue_id)