X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fmfib%2Fmfib_forward.c;h=3d0e0d479962c60f90ed32bd5ffd119a1475c743;hb=ce111d2ee3bacec2a09d8f5b664dcfafa0dd50c7;hp=3d8f4f98cb0374076cde1fa6f5be4810ed46de22;hpb=e5453d0fa29f39a7f78a7e22815566a7f4c9e5ef;p=vpp.git

diff --git a/src/vnet/mfib/mfib_forward.c b/src/vnet/mfib/mfib_forward.c
index 3d8f4f98cb0..3d0e0d47996 100644
--- a/src/vnet/mfib/mfib_forward.c
+++ b/src/vnet/mfib/mfib_forward.c
@@ -252,8 +252,8 @@ format_mfib_forward_rpf_trace (u8 * s, va_list * args)
     mfib_forward_rpf_trace_t * t = va_arg (*args, mfib_forward_rpf_trace_t *);
 
     s = format (s, "entry %d", t->entry_index);
-    s = format (s, " %d", t->sw_if_index);
-    s = format (s, " %U", format_mfib_itf_flags, t->itf_flags);
+    s = format (s, " itf %d", t->sw_if_index);
+    s = format (s, " flags %U", format_mfib_itf_flags, t->itf_flags);
 
     return s;
 }
@@ -342,7 +342,12 @@ mfib_forward_rpf (vlib_main_t * vm,
 {
     u32 n_left_from, n_left_to_next, * from, * to_next;
     mfib_forward_rpf_next_t next;
+    vlib_node_runtime_t *error_node;
 
+    if (is_v4)
+        error_node = vlib_node_get_runtime (vm, ip4_input_node.index);
+    else
+        error_node = vlib_node_get_runtime (vm, ip6_input_node.index);
     from = vlib_frame_vector_args (frame);
     n_left_from = frame->n_vectors;
     next = MFIB_FORWARD_RPF_NEXT_DROP;
@@ -361,6 +366,7 @@ mfib_forward_rpf (vlib_main_t * vm,
             u32 pi0, next0;
             mfib_itf_flags_t iflags0;
             mfib_entry_flags_t eflags0;
+            u8 error0;
 
             pi0 = from[0];
             to_next[0] = pi0;
@@ -369,6 +375,7 @@ mfib_forward_rpf (vlib_main_t * vm,
             n_left_to_next -= 1;
             n_left_from -= 1;
 
+            error0 = IP4_ERROR_NONE;
             b0 = vlib_get_buffer (vm, pi0);
             mfei0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];
             mfe0 = mfib_entry_get(mfei0);
@@ -444,8 +451,11 @@ mfib_forward_rpf (vlib_main_t * vm,
             else
             {
                 next0 = MFIB_FORWARD_RPF_NEXT_DROP;
+                error0 = IP4_ERROR_RPF_FAILURE;
             }
 
+            b0->error = error0 ? error_node->errors[error0] : 0;
+
             if (b0->flags & VLIB_BUFFER_IS_TRACED)
             {
                 mfib_forward_rpf_trace_t *t0;