X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdns%2Frequest_node.c;h=13ebc4c2c13499dbf187516b4a7d6ca16d2ba46e;hb=4f30bc74577959efddfe4bc544cea4ec5c7019da;hp=d26e579cf472ba40e12a4e204e0da508e437d5d6;hpb=34af0ccf5cf27d8a72119626d2d009222e4ff0a6;p=vpp.git

diff --git a/src/plugins/dns/request_node.c b/src/plugins/dns/request_node.c
index d26e579cf47..13ebc4c2c13 100644
--- a/src/plugins/dns/request_node.c
+++ b/src/plugins/dns/request_node.c
@@ -95,8 +95,8 @@ dns46_request_inline (vlib_main_t * vm,
 	    vlib_prefetch_buffer_header (p2, LOAD);
 	    vlib_prefetch_buffer_header (p3, LOAD);
 
-	    CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, STORE);
-	    CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, STORE);
+	    clib_prefetch_store (p2->data);
+	    clib_prefetch_store (p3->data);
 	  }
 
 	  /* speculatively enqueue b0 and b1 to the current next frame */
@@ -208,13 +208,7 @@ dns46_request_inline (vlib_main_t * vm,
 
 	  label0 = (u8 *) (d0 + 1);
 
-	  /*
-	   * vnet_dns_labels_to_name produces a non NULL terminated vector
-	   * vnet_dns_resolve_name expects a C-string.
-	   */
 	  name0 = vnet_dns_labels_to_name (label0, (u8 *) d0, (u8 **) & q0);
-	  vec_add1 (name0, 0);
-	  _vec_len (name0) -= 1;
 
 	  t0->request_type = DNS_PEER_PENDING_NAME_TO_IP;
 
@@ -242,14 +236,19 @@ dns46_request_inline (vlib_main_t * vm,
 	    clib_memcpy_fast (t0->dst_address, ip40->src_address.as_u8,
 			      sizeof (ip4_address_t));
 
-	  vnet_dns_resolve_name (dm, name0, t0, &ep0);
+	  /*
+	   * vnet_dns_labels_to_name produces a non NULL terminated vector
+	   * vnet_dns_resolve_name expects a C-string.
+	   */
+	  vec_add1 (name0, 0);
+	  vnet_dns_resolve_name (vm, dm, name0, t0, &ep0);
 
 	  if (ep0)
 	    {
 	      if (is_ip6)
-		vnet_send_dns6_reply (dm, t0, ep0, b0);
+		vnet_send_dns6_reply (vm, dm, t0, ep0, b0);
 	      else
-		vnet_send_dns4_reply (dm, t0, ep0, b0);
+		vnet_send_dns4_reply (vm, dm, t0, ep0, b0);
 	      next0 = DNS46_REQUEST_NEXT_IP_LOOKUP;
 	    }
 	  else
@@ -289,7 +288,6 @@ dns4_request_node_fn (vlib_main_t * vm,
   return dns46_request_inline (vm, node, frame, 0 /* is_ip6 */ );
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dns4_request_node) =
 {
   .function = dns4_request_node_fn,
@@ -306,7 +304,6 @@ VLIB_REGISTER_NODE (dns4_request_node) =
     [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip4-lookup",
   },
 };
-/* *INDENT-ON* */
 
 static uword
 dns6_request_node_fn (vlib_main_t * vm,
@@ -316,7 +313,6 @@ dns6_request_node_fn (vlib_main_t * vm,
   return dns46_request_inline (vm, node, frame, 1 /* is_ip6 */ );
 }
 
-/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (dns6_request_node) =
 {
   .function = dns6_request_node_fn,
@@ -333,7 +329,6 @@ VLIB_REGISTER_NODE (dns6_request_node) =
     [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip6-lookup",
   },
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON