diff options
Diffstat (limited to 'src/plugins/dns/dns.c')
-rw-r--r-- | src/plugins/dns/dns.c | 66 |
1 files changed, 25 insertions, 41 deletions
diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c index 76ce3dabd30..3cecf942d55 100644 --- a/src/plugins/dns/dns.c +++ b/src/plugins/dns/dns.c @@ -30,16 +30,27 @@ #define REPLY_MSG_ID_BASE dm->msg_id_base #include <vlibapi/api_helper_macros.h> -/* Macro to finish up custom dump fns */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define FINISH \ - vec_add1 (s, 0); \ - vl_print (handle, (char *)s); \ - vec_free (s); \ - return handle; +#define FINISH \ + vec_add1 (s, 0); \ + vlib_cli_output (handle, (char *) s); \ + vec_free (s); \ + return handle; dns_main_t dns_main; +/* the cache hashtable expects a NULL-terminated C-string but everywhere else + * expects a non-NULL terminated vector... The pattern of adding \0 but hiding + * it away drives AddressSanitizer crazy, this helper tries to bring some of + * its sanity back + */ +static_always_inline void +dns_terminate_c_string (u8 **v) +{ + vec_add1 (*v, 0); + vec_dec_len (*v, 1); + clib_mem_unpoison (vec_end (*v), 1); +} + static int dns_cache_clear (dns_main_t * dm) { @@ -50,13 +61,11 @@ dns_cache_clear (dns_main_t * dm) dns_cache_lock (dm, 1); - /* *INDENT-OFF* */ pool_foreach (ep, dm->entries) { vec_free (ep->name); vec_free (ep->pending_requests); } - /* *INDENT-ON* */ pool_free (dm->entries); hash_free (dm->cache_entry_by_name); @@ -828,8 +837,8 @@ re_resolve: pool_get (dm->entries, ep); clib_memset (ep, 0, sizeof (*ep)); - ep->name = format (0, "%s%c", name, 0); - _vec_len (ep->name) = vec_len (ep->name) - 1; + ep->name = format (0, "%s", name); + dns_terminate_c_string (&ep->name); hash_set_mem (dm->cache_entry_by_name, ep->name, ep - dm->entries); @@ -987,8 +996,7 @@ found_last_request: now = vlib_time_now (vm); cname = vnet_dns_labels_to_name (rr->rdata, reply, &pos2); /* Save the cname */ - vec_add1 (cname, 0); - _vec_len (cname) -= 1; + dns_terminate_c_string (&cname); ep = pool_elt_at_index (dm->entries, ep_index); ep->cname = cname; ep->flags |= (DNS_CACHE_ENTRY_FLAG_CNAME | DNS_CACHE_ENTRY_FLAG_VALID); @@ -1006,8 +1014,7 @@ found_last_request: clib_memset (next_ep, 0, sizeof (*next_ep)); next_ep->name = vec_dup (cname); - vec_add1 (next_ep->name, 0); - _vec_len (next_ep->name) -= 1; + dns_terminate_c_string (&next_ep->name); hash_set_mem (dm->cache_entry_by_name, next_ep->name, next_ep - dm->entries); @@ -1370,7 +1377,7 @@ vl_api_dns_resolve_name_t_handler (vl_api_dns_resolve_name_t * mp) dns_main_t *dm = &dns_main; vl_api_dns_resolve_name_reply_t *rmp; dns_cache_entry_t *ep = 0; - dns_pending_request_t _t0, *t0 = &_t0; + dns_pending_request_t _t0 = { 0 }, *t0 = &_t0; int rv; dns_resolve_name_t rn; @@ -1394,7 +1401,6 @@ vl_api_dns_resolve_name_t_handler (vl_api_dns_resolve_name_t * mp) if (ep == 0) return; - /* *INDENT-OFF* */ REPLY_MACRO2 (VL_API_DNS_RESOLVE_NAME_REPLY, ({ ip_address_copy_addr (rmp->ip4_address, &rn.address); if (ip_addr_version (&rn.address) == AF_IP4) @@ -1402,7 +1408,6 @@ vl_api_dns_resolve_name_t_handler (vl_api_dns_resolve_name_t * mp) else rmp->ip6_set = 1; })); - /* *INDENT-ON* */ } static void @@ -1416,7 +1421,7 @@ vl_api_dns_resolve_ip_t_handler (vl_api_dns_resolve_ip_t * mp) int i, len; u8 *lookup_name = 0; u8 digit, nybble; - dns_pending_request_t _t0, *t0 = &_t0; + dns_pending_request_t _t0 = { 0 }, *t0 = &_t0; if (mp->is_ip6) { @@ -1471,13 +1476,11 @@ vl_api_dns_resolve_ip_t_handler (vl_api_dns_resolve_ip_t * mp) if (ep == 0) return; - /* *INDENT-OFF* */ REPLY_MACRO2(VL_API_DNS_RESOLVE_IP_REPLY, ({ rv = vnet_dns_response_to_name (ep->dns_response, rmp, 0 /* ttl-ptr */); rmp->retval = clib_host_to_net_u32 (rv); })); - /* *INDENT-ON* */ } static clib_error_t * @@ -2087,7 +2090,6 @@ format_dns_cache (u8 * s, va_list * args) if (verbose > 0) { - /* *INDENT-OFF* */ pool_foreach (ep, dm->entries) { if (ep->flags & DNS_CACHE_ENTRY_FLAG_VALID) @@ -2126,7 +2128,6 @@ format_dns_cache (u8 * s, va_list * args) } vec_add1 (s, '\n'); } - /* *INDENT-ON* */ } dns_cache_unlock (dm); @@ -2161,14 +2162,12 @@ show_dns_cache_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_dns_cache_command) = { .path = "show dns cache", .short_help = "show dns cache [verbose [nn]]", .function = show_dns_cache_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * show_dns_servers_command_fn (vlib_main_t * vm, @@ -2198,14 +2197,12 @@ show_dns_servers_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_dns_server_command) = { .path = "show dns servers", .short_help = "show dns servers", .function = show_dns_servers_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * @@ -2300,14 +2297,12 @@ dns_cache_add_del_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (dns_cache_add_del_command) = { .path = "dns cache", .short_help = "dns cache [add|del|clear] <name> [ip4][ip6]", .function = dns_cache_add_del_command_fn, }; -/* *INDENT-ON* */ #define DNS_FORMAT_TEST 1 @@ -2548,14 +2543,12 @@ test_dns_fmt_command_fn (vlib_main_t * vm, } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_fmt_command) = { .path = "test dns format", .short_help = "test dns format", .function = test_dns_fmt_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_dns_unfmt_command_fn (vlib_main_t * vm, @@ -2588,14 +2581,12 @@ test_dns_unfmt_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_unfmt_command) = { .path = "test dns unformat", .short_help = "test dns unformat <name> [ip4][ip6]", .function = test_dns_unfmt_command_fn, }; -/* *INDENT-ON* */ static clib_error_t * test_dns_expire_command_fn (vlib_main_t * vm, @@ -2609,10 +2600,7 @@ test_dns_expire_command_fn (vlib_main_t * vm, dns_cache_entry_t *ep; if (unformat (input, "%v", &name)) - { - vec_add1 (name, 0); - _vec_len (name) -= 1; - } + dns_terminate_c_string (&name); else return clib_error_return (0, "no name provided"); @@ -2634,14 +2622,12 @@ test_dns_expire_command_fn (vlib_main_t * vm, return 0; } -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (test_dns_expire_command) = { .path = "test dns expire", .short_help = "test dns expire <name>", .function = test_dns_expire_command_fn, }; -/* *INDENT-ON* */ #endif void @@ -2883,7 +2869,6 @@ dns_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ VLIB_INIT_FUNCTION (dns_init) = { .init_order = VLIB_INITS ("flow_classify_init", "dns_init"), }; @@ -2893,7 +2878,6 @@ VLIB_PLUGIN_REGISTER () = .version = VPP_BUILD_VER, .description = "Simple DNS name resolver", }; -/* *INDENT-ON* */ /* |