X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=09082fcf1ff5682a955b756a6c3831f767bb02da;hb=0eff156c7816507fa1865b76e948574dd320fae0;hp=8339377b2dbb82babf8773e6d00a1c2c0513cce1;hpb=139dd00301131050db32bf0cb08333aa7440c817;p=collectd.git diff --git a/src/dns.c b/src/dns.c index 8339377b..09082fcf 100644 --- a/src/dns.c +++ b/src/dns.c @@ -1,6 +1,7 @@ /** * collectd - src/dns.c - * Copyright (C) 2006,2007 Florian octo Forster + * Copyright (C) 2006-2011 Florian octo Forster + * Copyright (C) 2009 Mirko Buffoni * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,7 +17,8 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster + * Mirko Buffoni **/ #define _BSD_SOURCE @@ -28,9 +30,13 @@ #include "utils_dns.h" #include -#include #include +#include +#if HAVE_PCAP_BPF_H +# include +#endif + /* * Private data types */ @@ -49,15 +55,16 @@ static const char *config_keys[] = { "Interface", "IgnoreSource", - NULL + "SelectNumericQueryTypes" }; -static int config_keys_num = 2; +static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); +static int select_numeric_qtype = 1; #define PCAP_SNAPLEN 1460 static char *pcap_device = NULL; -static counter_t tr_queries; -static counter_t tr_responses; +static derive_t tr_queries; +static derive_t tr_responses; static counter_list_t *qtype_list; static counter_list_t *opcode_list; static counter_list_t *rcode_list; @@ -77,14 +84,10 @@ static counter_list_t *counter_list_search (counter_list_t **list, unsigned int { counter_list_t *entry; - DEBUG ("counter_list_search (list = %p, key = %u)", - (void *) *list, key); - for (entry = *list; entry != NULL; entry = entry->next) if (entry->key == key) break; - DEBUG ("return (%p)", (void *) entry); return (entry); } @@ -93,9 +96,6 @@ static counter_list_t *counter_list_create (counter_list_t **list, { counter_list_t *entry; - DEBUG ("counter_list_create (list = %p, key = %u, value = %u)", - (void *) *list, key, value); - entry = (counter_list_t *) malloc (sizeof (counter_list_t)); if (entry == NULL) return (NULL); @@ -119,7 +119,6 @@ static counter_list_t *counter_list_create (counter_list_t **list, last->next = entry; } - DEBUG ("return (%p)", (void *) entry); return (entry); } @@ -128,9 +127,6 @@ static void counter_list_add (counter_list_t **list, { counter_list_t *entry; - DEBUG ("counter_list_add (list = %p, key = %u, increment = %u)", - (void *) *list, key, increment); - entry = counter_list_search (list, key); if (entry != NULL) @@ -141,7 +137,6 @@ static void counter_list_add (counter_list_t **list, { counter_list_create (list, key, increment); } - DEBUG ("return ()"); } static int dns_config (const char *key, const char *value) @@ -158,6 +153,13 @@ static int dns_config (const char *key, const char *value) if (value != NULL) ignore_list_add_name (value); } + else if (strcasecmp (key, "SelectNumericQueryTypes") == 0) + { + if ((value != NULL) && IS_FALSE (value)) + select_numeric_qtype = 0; + else + select_numeric_qtype = 1; + } else { return (-1); @@ -171,13 +173,24 @@ static void dns_child_callback (const rfc1035_header_t *dns) if (dns->qr == 0) { /* This is a query */ + int skip = 0; + if (!select_numeric_qtype) + { + const char *str = qtype_str(dns->qtype); + if ((str == NULL) || (str[0] == '#')) + skip = 1; + } + pthread_mutex_lock (&traffic_mutex); tr_queries += dns->length; pthread_mutex_unlock (&traffic_mutex); - pthread_mutex_lock (&qtype_mutex); - counter_list_add (&qtype_list, dns->qtype, 1); - pthread_mutex_unlock (&qtype_mutex); + if (skip == 0) + { + pthread_mutex_lock (&qtype_mutex); + counter_list_add (&qtype_list, dns->qtype, 1); + pthread_mutex_unlock (&qtype_mutex); + } } else { @@ -197,7 +210,7 @@ static void dns_child_callback (const rfc1035_header_t *dns) pthread_mutex_unlock (&opcode_mutex); } -static void *dns_child_loop (void __attribute__((unused)) *dummy) +static void *dns_child_loop (__attribute__((unused)) void *dummy) { pcap_t *pcap_obj; char pcap_error[PCAP_ERRBUF_SIZE]; @@ -213,11 +226,11 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy) } /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG ("Creating PCAP object.."); + DEBUG ("dns plugin: Creating PCAP object.."); pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any", PCAP_SNAPLEN, 0 /* Not promiscuous */, - interval_g, + (int) CDTIME_T_TO_MS (interval_g / 2), pcap_error); if (pcap_obj == NULL) { @@ -240,7 +253,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy) return (NULL); } - DEBUG ("PCAP object created."); + DEBUG ("dns plugin: PCAP object created."); dnstop_set_pcap_obj (pcap_obj); dnstop_set_callback (dns_child_callback); @@ -253,7 +266,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy) ERROR ("dns plugin: Listener thread is exiting " "abnormally: %s", pcap_geterr (pcap_obj)); - DEBUG ("child is exiting"); + DEBUG ("dns plugin: Child is exiting."); pcap_close (pcap_obj); listen_thread_init = 0; @@ -290,13 +303,13 @@ static int dns_init (void) return (0); } /* int dns_init */ -static void submit_counter (const char *type, const char *type_instance, - counter_t value) +static void submit_derive (const char *type, const char *type_instance, + derive_t value) { value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = value; + values[0].derive = value; vl.values = values; vl.values_len = 1; @@ -306,15 +319,15 @@ static void submit_counter (const char *type, const char *type_instance, sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); plugin_dispatch_values (&vl); -} /* void submit_counter */ +} /* void submit_derive */ -static void submit_octets (counter_t queries, counter_t responses) +static void submit_octets (derive_t queries, derive_t responses) { value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - values[0].counter = queries; - values[1].counter = responses; + values[0].derive = queries; + values[1].derive = responses; vl.values = values; vl.values_len = 2; @@ -323,7 +336,7 @@ static void submit_octets (counter_t queries, counter_t responses) sstrncpy (vl.type, "dns_octets", sizeof (vl.type)); plugin_dispatch_values (&vl); -} /* void submit_counter */ +} /* void submit_octets */ static int dns_read (void) { @@ -354,8 +367,8 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DEBUG ("qtype = %u; counter = %u;", keys[i], values[i]); - submit_counter ("dns_qtype", qtype_str (keys[i]), values[i]); + DEBUG ("dns plugin: qtype = %u; counter = %u;", keys[i], values[i]); + submit_derive ("dns_qtype", qtype_str (keys[i]), values[i]); } pthread_mutex_lock (&opcode_mutex); @@ -370,8 +383,8 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DEBUG ("opcode = %u; counter = %u;", keys[i], values[i]); - submit_counter ("dns_opcode", opcode_str (keys[i]), values[i]); + DEBUG ("dns plugin: opcode = %u; counter = %u;", keys[i], values[i]); + submit_derive ("dns_opcode", opcode_str (keys[i]), values[i]); } pthread_mutex_lock (&rcode_mutex); @@ -386,8 +399,8 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DEBUG ("rcode = %u; counter = %u;", keys[i], values[i]); - submit_counter ("dns_rcode", rcode_str (keys[i]), values[i]); + DEBUG ("dns plugin: rcode = %u; counter = %u;", keys[i], values[i]); + submit_derive ("dns_rcode", rcode_str (keys[i]), values[i]); } return (0);