bonding: support custom interface IDs

[vpp.git] / src / vnet / dns / request_node.c

diff --git a/src/vnet/dns/request_node.c b/src/vnet/dns/request_node.c
index 6446880..f9ad7cc 100644 (file)
--- a/src/vnet/dns/request_node.c
+++ b/src/vnet/dns/request_node.c
@@ -51,6 +51,7 @@ typedef enum
 {
   DNS46_REQUEST_NEXT_DROP,
   DNS46_REQUEST_NEXT_IP_LOOKUP,
+  DNS46_REQUEST_NEXT_PUNT,
   DNS46_REQUEST_N_NEXT,
 } dns46_request_next_t;
 
@@ -160,15 +161,22 @@ dns46_request_inline (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);
          u0 = (udp_header_t *) ((u8 *) d0 - sizeof (*u0));
+
+         if (PREDICT_FALSE (dm->is_enabled == 0))
+           {
+             next0 = DNS46_REQUEST_NEXT_PUNT;
+             goto done0;
+           }
+
          if (is_ip6)
            {
-             ip60 = (ip6_header_t *) (((u8 *) u0) - sizeof (ip4_header_t));
+             ip60 = (ip6_header_t *) (((u8 *) u0) - sizeof (ip6_header_t));
+             next0 = DNS46_REQUEST_NEXT_DROP;
              error0 = DNS46_REQUEST_ERROR_UNIMPLEMENTED;
              goto done0;
            }
@@ -187,18 +195,26 @@ dns46_request_inline (vlib_main_t * vm,
          /* Requests only */
          if (flags0 & DNS_QR)
            {
+             next0 = DNS46_REQUEST_NEXT_DROP;
              error0 = DNS46_REQUEST_ERROR_BAD_REQUEST;
              goto done0;
            }
          if (clib_net_to_host_u16 (d0->qdcount) != 1)
            {
+             next0 = DNS46_REQUEST_NEXT_DROP;
              error0 = DNS46_REQUEST_ERROR_TOO_MANY_REQUESTS;
              goto done0;
            }
 
          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;
 
@@ -220,11 +236,11 @@ dns46_request_inline (vlib_main_t * vm,
          t0->id = d0->id;
          t0->name = name0;
          if (is_ip6)
-           clib_memcpy (t0->dst_address, ip60->src_address.as_u8,
-                        sizeof (ip6_address_t));
+           clib_memcpy_fast (t0->dst_address, ip60->src_address.as_u8,
+                             sizeof (ip6_address_t));
          else
-           clib_memcpy (t0->dst_address, ip40->src_address.as_u8,
-                        sizeof (ip4_address_t));
+           clib_memcpy_fast (t0->dst_address, ip40->src_address.as_u8,
+                             sizeof (ip4_address_t));
 
          vnet_dns_resolve_name (dm, name0, t0, &ep0);
 
@@ -286,6 +302,7 @@ VLIB_REGISTER_NODE (dns4_request_node) =
   .n_next_nodes = DNS46_REQUEST_N_NEXT,
   .next_nodes = {
     [DNS46_REQUEST_NEXT_DROP] = "error-drop",
+    [DNS46_REQUEST_NEXT_PUNT] = "error-punt",
     [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip4-lookup",
   },
 };
@@ -312,6 +329,7 @@ VLIB_REGISTER_NODE (dns6_request_node) =
   .n_next_nodes = DNS46_REQUEST_N_NEXT,
   .next_nodes = {
     [DNS46_REQUEST_NEXT_DROP] = "error-drop",
+    [DNS46_REQUEST_NEXT_PUNT] = "error-punt",
     [DNS46_REQUEST_NEXT_IP_LOOKUP] = "ip6-lookup",
   },
 };