X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fdns%2Freply_node.c;h=81ce8f480d039729a62d8b084e177061cec9b147;hb=a8ac77f4706b7e40887426c446ebded4555885e4;hp=e045ba8cda4b05ec388d42949765b2bad51fab6d;hpb=6545716c073c88ad86458620c6dbc59ba1cd00bb;p=vpp.git

diff --git a/src/vnet/dns/reply_node.c b/src/vnet/dns/reply_node.c
index e045ba8cda4..81ce8f480d0 100644
--- a/src/vnet/dns/reply_node.c
+++ b/src/vnet/dns/reply_node.c
@@ -50,6 +50,7 @@ static char *dns46_reply_error_strings[] = {
 typedef enum
 {
   DNS46_REPLY_NEXT_DROP,
+  DNS46_REPLY_NEXT_PUNT,
   DNS46_REPLY_N_NEXT,
 } dns46_reply_next_t;
 
@@ -59,6 +60,7 @@ dns46_reply_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next;
   dns46_reply_next_t next_index;
+  dns_main_t *dm = &dns_main;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -139,8 +141,8 @@ dns46_reply_node_fn (vlib_main_t * vm,
 	  vlib_buffer_t *b0;
 	  u32 next0 = DNS46_REPLY_NEXT_DROP;
 	  dns_header_t *d0;
-	  u32 pool_index0;
-	  u32 error0;
+	  u32 pool_index0 = ~0;
+	  u32 error0 = 0;
 	  u8 *resp0 = 0;
 
 	  /* speculatively enqueue b0 to the current next frame */
@@ -149,17 +151,22 @@ dns46_reply_node_fn (vlib_main_t * vm,
 	  from += 1;
 	  to_next += 1;
 	  n_left_from -= 1;
-
 	  n_left_to_next -= 1;
 
 	  b0 = vlib_get_buffer (vm, bi0);
 	  d0 = vlib_buffer_get_current (b0);
+	  if (PREDICT_FALSE (dm->is_enabled == 0))
+	    {
+	      next0 = DNS46_REPLY_NEXT_PUNT;
+	      error0 = DNS46_REPLY_ERROR_DISABLED;
+	      goto done0;
+	    }
 
 	  pool_index0 = clib_host_to_net_u16 (d0->id);
 
 	  /* Save the reply */
 	  vec_validate (resp0, vlib_buffer_length_in_chain (vm, b0) - 1);
-	  clib_memcpy (resp0, d0, vlib_buffer_length_in_chain (vm, b0));
+	  clib_memcpy_fast (resp0, d0, vlib_buffer_length_in_chain (vm, b0));
 
 	  /*
 	   * Deal with everything in process ctx on the main thread
@@ -169,6 +176,7 @@ dns46_reply_node_fn (vlib_main_t * vm,
 					(uword) resp0);
 	  error0 = DNS46_REPLY_ERROR_PROCESSED;
 
+	done0:
 	  b0->error = node->errors[error0];
 
 	  if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -192,18 +200,23 @@ dns46_reply_node_fn (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
+/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dns46_reply_node) =
 {
-  .function = dns46_reply_node_fn,.name = "dns46_reply",.vector_size =
-    sizeof (u32),.format_trace = format_dns46_reply_trace,.type =
-    VLIB_NODE_TYPE_INTERNAL,.n_errors =
-    ARRAY_LEN (dns46_reply_error_strings),.error_strings =
-    dns46_reply_error_strings,.n_next_nodes = DNS46_REPLY_N_NEXT,
-    /* edit / add dispositions here */
-    .next_nodes =
-  {
-  [DNS46_REPLY_NEXT_DROP] = "error-drop",}
-,};
+  .function = dns46_reply_node_fn,
+  .name = "dns46_reply",
+  .vector_size = sizeof (u32),
+  .format_trace = format_dns46_reply_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN (dns46_reply_error_strings),
+  .error_strings = dns46_reply_error_strings,
+  .n_next_nodes = DNS46_REPLY_N_NEXT,
+  .next_nodes = {
+    [DNS46_REPLY_NEXT_DROP] = "error-drop",
+    [DNS46_REPLY_NEXT_PUNT] = "error-punt",
+  },
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON