npt66: add show command and rx/tx counters

[vpp.git] / src / plugins / npt66 / npt66_node.c

diff --git a/src/plugins/npt66/npt66_node.c b/src/plugins/npt66/npt66_node.c
index 21dddee..ebe3359 100644 (file)
--- a/src/plugins/npt66/npt66_node.c
+++ b/src/plugins/npt66/npt66_node.c
@@ -9,6 +9,7 @@
 #include <vnet/ip/ip6_packet.h>
 
 #include <npt66/npt66.h>
+#include <npt66/npt66.api_enum.h>
 
 typedef struct
 {
@@ -126,7 +127,10 @@ npt66_translate (ip6_header_t *ip, npt66_binding_t *binding, int dir)
       if (!ip6_prefix_cmp (ip->src_address, binding->internal,
                           binding->internal_plen))
        {
-         clib_warning ("npt66_translate: src address is not internal");
+         clib_warning (
+           "npt66_translate: src address is not internal (%U -> %U)",
+           format_ip6_address, &ip->src_address, format_ip6_address,
+           &ip->dst_address);
          goto done;
        }
       ip->src_address = ip6_prefix_copy (ip->src_address, binding->external,
@@ -140,7 +144,10 @@ npt66_translate (ip6_header_t *ip, npt66_binding_t *binding, int dir)
       if (!ip6_prefix_cmp (ip->dst_address, binding->external,
                           binding->external_plen))
        {
-         clib_warning ("npt66_translate: dst address is not external");
+         clib_warning (
+           "npt66_translate: dst address is not external (%U -> %U)",
+           format_ip6_address, &ip->src_address, format_ip6_address,
+           &ip->dst_address);
          goto done;
        }
       ip->dst_address = ip6_prefix_copy (ip->dst_address, binding->internal,
@@ -177,7 +184,6 @@ npt66_node_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
   /* Stage 1: build vector of flow hash (based on lookup mask) */
   while (n_left_from > 0)
     {
-      clib_warning ("DIRECTION: %u", dir);
       u32 sw_if_index = vnet_buffer (b[0])->sw_if_index[dir];
       u32 iph_offset =
        dir == VLIB_TX ? vnet_buffer (b[0])->ip.save_rewrite_length : 0;
@@ -192,11 +198,17 @@ npt66_node_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
       int rv = npt66_translate (ip, binding, dir);
       if (rv < 0)
        {
-         clib_warning ("npt66_translate failed");
+         vlib_node_increment_counter (vm, node->node_index,
+                                      NPT66_ERROR_TRANSLATION, 1);
          *next = NPT66_NEXT_DROP;
+         goto next;
        }
+      else if (dir == VLIB_TX)
+       vlib_node_increment_counter (vm, node->node_index, NPT66_ERROR_TX, 1);
+      else
+       vlib_node_increment_counter (vm, node->node_index, NPT66_ERROR_RX, 1);
 
-      /*next: */
+    next:
       next += 1;
       n_left_from -= 1;
       b += 1;
@@ -255,8 +267,8 @@ VLIB_REGISTER_NODE(npt66_input_node) = {
     .vector_size = sizeof(u32),
     .format_trace = format_npt66_trace,
     .type = VLIB_NODE_TYPE_INTERNAL,
-    // .n_errors = NPT66_N_ERROR,
-    // .error_counters = npt66_error_counters,
+    .n_errors = NPT66_N_ERROR,
+    .error_counters = npt66_error_counters,
     .n_next_nodes = NPT66_N_NEXT,
     .next_nodes =
         {
@@ -269,8 +281,8 @@ VLIB_REGISTER_NODE (npt66_output_node) = {
   .vector_size = sizeof (u32),
   .format_trace = format_npt66_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
-  // .n_errors = npt66_N_ERROR,
-  // .error_counters = npt66_error_counters,
+  .n_errors = NPT66_N_ERROR,
+  .error_counters = npt66_error_counters,
   .sibling_of = "npt66-input",
 };
 
@@ -278,10 +290,8 @@ VLIB_REGISTER_NODE (npt66_output_node) = {
 VNET_FEATURE_INIT (npt66_input, static) = {
   .arc_name = "ip6-unicast",
   .node_name = "npt66-input",
-  .runs_after = VNET_FEATURES ("ip4-sv-reassembly-feature"),
 };
 VNET_FEATURE_INIT (npt66_output, static) = {
   .arc_name = "ip6-output",
   .node_name = "npt66-output",
-  .runs_after = VNET_FEATURES ("ip4-sv-reassembly-output-feature"),
 };