quic: Clean quic_crypto_setup_cipher

[vpp.git] / src / vlib / error.c

diff --git a/src/vlib/error.c b/src/vlib/error.c
index ef50663..7357f17 100644 (file)
--- a/src/vlib/error.c
+++ b/src/vlib/error.c
@@ -52,8 +52,10 @@ vlib_error_drop_buffers (vlib_main_t * vm,
 {
   u32 n_left_this_frame, n_buffers_left, *args, n_args_left;
   vlib_error_t drop_error;
+  vlib_node_t *n;
 
-  drop_error = vlib_error_set (drop_error_node, drop_error_code);
+  n = vlib_get_node (vm, drop_error_node);
+  drop_error = n->error_heap_index + drop_error_code;
 
   n_buffers_left = n_buffers;
   while (n_buffers_left > 0)
@@ -116,6 +118,8 @@ vlib_register_errors (vlib_main_t * vm,
                      u32 node_index, u32 n_errors, char *error_strings[])
 {
   vlib_error_main_t *em = &vm->error_main;
+  vlib_node_main_t *nm = &vm->node_main;
+
   vlib_node_t *n = vlib_get_node (vm, node_index);
   uword l;
   void *oldheap;
@@ -160,15 +164,18 @@ vlib_register_errors (vlib_main_t * vm,
   /* Register counter indices in the stat segment directory */
   {
     int i;
-    u8 *error_name;
+    u8 *error_name = 0;
 
     for (i = 0; i < n_errors; i++)
       {
-       error_name = format (0, "/err/%v/%s%c", n->name, error_strings[i], 0);
-       /* Note: error_name consumed by the following call */
+       vec_reset_length (error_name);
+       error_name =
+         format (error_name, "/err/%v/%s%c", n->name, error_strings[i], 0);
        vlib_stats_register_error_index (oldheap, error_name, em->counters,
                                         n->error_heap_index + i);
       }
+
+    vec_free (error_name);
   }
 
   /* (re)register the em->counters base address, switch back to main heap */
@@ -179,11 +186,14 @@ vlib_register_errors (vlib_main_t * vm,
     uword i;
 
     clib_memset (&t, 0, sizeof (t));
+    if (n_errors > 0)
+      vec_validate (nm->node_by_error, n->error_heap_index + n_errors - 1);
     for (i = 0; i < n_errors; i++)
       {
        t.format = (char *) format (0, "%v %s: %%d",
                                    n->name, error_strings[i]);
        vm->error_elog_event_types[n->error_heap_index + i] = t;
+       nm->node_by_error[n->error_heap_index + i] = n->index;
       }
   }
 }
@@ -237,10 +247,10 @@ show_errors (vlib_main_t * vm,
              continue;
 
             if (verbose)
-              vlib_cli_output (vm, "%10Ld%=40v%=20s%=6d", c, n->name,
+              vlib_cli_output (vm, "%10lu%=40v%=20s%=6d", c, n->name,
                                em->error_strings_heap[i], i);
             else
-              vlib_cli_output (vm, "%10d%=40v%s", c, n->name,
+              vlib_cli_output (vm, "%10lu%=40v%s", c, n->name,
                                em->error_strings_heap[i]);
          }
       }
@@ -260,7 +270,7 @@ show_errors (vlib_main_t * vm,
          if (sums[i])
            {
              if (verbose)
-               vlib_cli_output (vm, "%10Ld%=40v%=20s%=10d", sums[i], n->name,
+               vlib_cli_output (vm, "%10lu%=40v%=20s%=10d", sums[i], n->name,
                                 em->error_strings_heap[i], i);
            }
        }