ipsec: Honour IPSec SA table-ID over API

[vpp.git] / src / vnet / ip / ip6_forward.c

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 294f632..aba4067 100644 (file)
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -369,8 +369,8 @@ ip6_add_del_interface_address (vlib_main_t * vm,
       ip_interface_address_t *ia;
       vnet_sw_interface_t *sif;
 
-      pool_foreach(sif, vnm->interface_main.sw_interfaces,
-      ({
+      pool_foreach (sif, vnm->interface_main.sw_interfaces)
+       {
           if (im->fib_index_by_sw_if_index[sw_if_index] ==
               im->fib_index_by_sw_if_index[sif->sw_if_index])
             {
@@ -417,7 +417,7 @@ ip6_add_del_interface_address (vlib_main_t * vm,
                      }
                  }));
             }
-      }));
+      }
     }
   /* *INDENT-ON* */
 
@@ -956,7 +956,10 @@ format_ip6_forward_next_trace (u8 * s, va_list * args)
   ip6_forward_next_trace_t *t = va_arg (*args, ip6_forward_next_trace_t *);
   u32 indent = format_get_indent (s);
 
-  s = format (s, "%U%U",
+  s = format (s, "%Ufib:%d adj:%d flow:%d",
+             format_white_space, indent,
+             t->fib_index, t->adj_index, t->flow_hash);
+  s = format (s, "\n%U%U",
              format_white_space, indent,
              format_ip6_header, t->packet_data, sizeof (t->packet_data));
   return s;
@@ -1310,7 +1313,7 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
          vlib_prefetch_buffer_data (b[3], LOAD);
        }
 
-      u8 error[2];
+      ip6_error_t error[2];
       error[0] = IP6_ERROR_UNKNOWN_PROTOCOL;
       error[1] = IP6_ERROR_UNKNOWN_PROTOCOL;
 
@@ -1467,8 +1470,8 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       next[1] =
        error[1] != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next[1];
 
-      b[0]->error = error_node->errors[0];
-      b[1]->error = error_node->errors[1];
+      b[0]->error = error_node->errors[error[0]];
+      b[1]->error = error_node->errors[error[1]];
 
       if (head_of_feature_arc)
        {
@@ -1587,7 +1590,7 @@ ip6_local_inline (vlib_main_t * vm, vlib_node_runtime_t * node,
       next[0] =
        error != IP6_ERROR_UNKNOWN_PROTOCOL ? IP_LOCAL_NEXT_DROP : next[0];
 
-      b[0]->error = error_node->errors[0];
+      b[0]->error = error_node->errors[error];
 
       if (head_of_feature_arc)
        {