X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fnode.c;h=88185ce921f6dff59c9a4638aa0510b8ce5f6367;hb=940d1c8a18d672c37c6545ffdabd090d29f09850;hp=805c69e4f8bf0fe63cd18a7ecd4190ea9fc7cd13;hpb=1ddbc0138b64486b8e51e5e12fcad21fba8b8b68;p=vpp.git

diff --git a/src/vlib/node.c b/src/vlib/node.c
index 805c69e4f8b..88185ce921f 100644
--- a/src/vlib/node.c
+++ b/src/vlib/node.c
@@ -290,7 +290,7 @@ node_elog_init (vlib_main_t * vm, uword ni)
 {
   elog_event_type_t t;
 
-  memset (&t, 0, sizeof (t));
+  clib_memset (&t, 0, sizeof (t));
 
   /* 2 event types for this node: one when node function is called.
      One when it returns. */
@@ -347,8 +347,9 @@ register_node (vlib_main_t * vm, vlib_node_registration_t * r)
   ASSERT (r->function != 0);
 
   n = clib_mem_alloc_no_fail (sizeof (n[0]));
-  memset (n, 0, sizeof (n[0]));
+  clib_memset (n, 0, sizeof (n[0]));
   n->index = vec_len (nm->nodes);
+  n->node_fn_registrations = r->node_fn_registrations;
 
   vec_add1 (nm->nodes, n);
 
@@ -450,7 +451,7 @@ register_node (vlib_main_t * vm, vlib_node_registration_t * r)
 	  clib_panic ("failed to allocate process stack (%d bytes)",
 		      1 << log2_n_stack_bytes);
 
-	memset (p, 0, sizeof (p[0]));
+	clib_memset (p, 0, sizeof (p[0]));
 	p->log2_n_stack_bytes = log2_n_stack_bytes;
 
 	/* Process node's runtime index is really index into process
@@ -528,7 +529,7 @@ null_node_fn (vlib_main_t * vm,
   u16 n_vectors = frame->n_vectors;
 
   vlib_node_increment_counter (vm, node->node_index, 0, n_vectors);
-  vlib_buffer_free (vm, vlib_frame_args (frame), n_vectors);
+  vlib_buffer_free (vm, vlib_frame_vector_args (frame), n_vectors);
   vlib_frame_free (vm, node, frame);
 
   return n_vectors;