Typos. A bunch of typos I've been collecting.

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

diff --git a/src/vnet/dns/dns.c b/src/vnet/dns/dns.c
index 54b75aa..2951679 100644 (file)
--- a/src/vnet/dns/dns.c
+++ b/src/vnet/dns/dns.c
@@ -72,6 +72,7 @@ dns_enable_disable (dns_main_t * dm, int is_enable)
 {
   vlib_thread_main_t *tm = &vlib_thread_main;
   u32 n_vlib_mains = tm->n_vlib_mains;
+  vlib_main_t *vm = dm->vlib_main;
 
   if (is_enable)
     {
@@ -79,6 +80,23 @@ dns_enable_disable (dns_main_t * dm, int is_enable)
          && (vec_len (dm->ip6_name_servers) == 0))
        return VNET_API_ERROR_NO_NAME_SERVERS;
 
+      if (dm->udp_ports_registered == 0)
+       {
+         udp_register_dst_port (vm, UDP_DST_PORT_dns_reply,
+                                dns46_reply_node.index, 1 /* is_ip4 */ );
+
+         udp_register_dst_port (vm, UDP_DST_PORT_dns_reply6,
+                                dns46_reply_node.index, 0 /* is_ip4 */ );
+
+         udp_register_dst_port (vm, UDP_DST_PORT_dns,
+                                dns4_request_node.index, 1 /* is_ip4 */ );
+
+         udp_register_dst_port (vm, UDP_DST_PORT_dns6,
+                                dns6_request_node.index, 0 /* is_ip4 */ );
+
+         dm->udp_ports_registered = 1;
+       }
+
       if (dm->cache_entry_by_name == 0)
        {
          if (n_vlib_mains > 1)
@@ -252,7 +270,7 @@ vnet_dns_send_dns4_request (dns_main_t * dm,
     }
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm4, ia);
     goto found_src_address;
@@ -360,7 +378,7 @@ vnet_dns_send_dns6_request (dns_main_t * dm,
   sw_if_index = fib_entry_get_resolving_interface (fei);
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm6, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm6, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm6, ia);
     goto found_src_address;
@@ -1597,17 +1615,6 @@ dns_init (vlib_main_t * vm)
   dm->max_ttl_in_seconds = 86400;
   dm->random_seed = 0xDEADDABE;
 
-  udp_register_dst_port (vm, UDP_DST_PORT_dns_reply, dns46_reply_node.index,
-                        1 /* is_ip4 */ );
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dns_reply6, dns46_reply_node.index,
-                        0 /* is_ip4 */ );
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dns, dns4_request_node.index,
-                        1 /* is_ip4 */ );
-
-  udp_register_dst_port (vm, UDP_DST_PORT_dns6, dns6_request_node.index,
-                        0 /* is_ip4 */ );
   return 0;
 }
 
@@ -2677,7 +2684,7 @@ test_dns_expire_command_fn (vlib_main_t * vm,
                            vlib_cli_command_t * cmd)
 {
   dns_main_t *dm = &dns_main;
-  u8 *name;
+  u8 *name = 0;
   uword *p;
   clib_error_t *e;
   dns_cache_entry_t *ep;
@@ -2687,6 +2694,8 @@ test_dns_expire_command_fn (vlib_main_t * vm,
       vec_add1 (name, 0);
       _vec_len (name) -= 1;
     }
+  else
+    return clib_error_return (0, "no name provided");
 
   dns_cache_lock (dm);
 
@@ -2803,7 +2812,6 @@ vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * pr,
    * In the resolution-required / deferred case, resetting a freshly-allocated
    * buffer won't hurt. We hope.
    */
-  b0->flags &= VLIB_BUFFER_NON_DEFAULT_FREELIST;
   b0->flags |= (VNET_BUFFER_F_LOCALLY_ORIGINATED
                | VLIB_BUFFER_TOTAL_LENGTH_VALID);
   b0->current_data = 0;
@@ -2844,7 +2852,7 @@ vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * pr,
     }
 
   /* *INDENT-OFF* */
-  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnummbered */,
+  foreach_ip_interface_address(lm4, ia, sw_if_index, 1 /* honor unnumbered */,
   ({
     src_address = ip_interface_address_get_address (lm4, ia);
     goto found_src_address;