X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=f3280c0bed9f65ef37d3e8e554be640ca36ab83d;hb=aa73e1258b820025e1ff04d6fe2cc59696ce1a12;hp=c9beb166e8f0a6f09c076cd554d244ad031808d6;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git diff --git a/src/dns.c b/src/dns.c index c9beb166..f3280c0b 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) 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 @@ -17,27 +18,24 @@ * * Authors: * Florian octo Forster + * Mirko Buffoni **/ +#define _BSD_SOURCE + #include "collectd.h" #include "common.h" #include "plugin.h" #include "configfile.h" -#if HAVE_LIBPCAP && HAVE_LIBPTHREAD -# include "utils_dns.h" -# include -# include -# include -# define DNS_HAVE_READ 1 -#else -# define DNS_HAVE_READ 0 -#endif +#include "utils_dns.h" +#include +#include +#include /* * Private data types */ -#if DNS_HAVE_READ struct counter_list_s { unsigned int key; @@ -45,50 +43,18 @@ struct counter_list_s struct counter_list_s *next; }; typedef struct counter_list_s counter_list_t; -#endif /* * Private variables */ -static data_source_t octets_dsrc[2] = -{ - {"queries", DS_TYPE_COUNTER, 0, 125000000.0}, - {"responses", DS_TYPE_COUNTER, 0, 125000000.0} -}; - -static data_set_t octets_ds = -{ - "dns_octets", 2, octets_dsrc -}; - -static data_source_t counter_dsrc[1] = -{ - {"value", DS_TYPE_COUNTER, 0, 65535.0} -}; - -static data_set_t qtype_ds = -{ - "dns_qtype", 1, counter_dsrc -}; - -static data_set_t opcode_ds = -{ - "dns_opcode", 1, counter_dsrc -}; - -static data_set_t rcode_ds = -{ - "dns_rcode", 1, counter_dsrc -}; - -#if DNS_HAVE_READ 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; @@ -106,12 +72,10 @@ static pthread_mutex_t traffic_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t qtype_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t opcode_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t rcode_mutex = PTHREAD_MUTEX_INITIALIZER; -#endif /* DNS_HAVE_READ */ /* * Private functions */ -#if DNS_HAVE_READ static counter_list_t *counter_list_search (counter_list_t **list, unsigned int key) { counter_list_t *entry; @@ -197,6 +161,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); @@ -210,13 +181,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 { @@ -236,7 +218,7 @@ static void dns_child_callback (const rfc1035_header_t *dns) pthread_mutex_unlock (&opcode_mutex); } -static void *dns_child_loop (void *dummy) +static void *dns_child_loop (void __attribute__((unused)) *dummy) { pcap_t *pcap_obj; char pcap_error[PCAP_ERRBUF_SIZE]; @@ -252,8 +234,8 @@ static void *dns_child_loop (void *dummy) } /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DEBUG ("Creating PCAP object.."); - pcap_obj = pcap_open_live (pcap_device, + DEBUG ("dns plugin: Creating PCAP object.."); + pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any", PCAP_SNAPLEN, 0 /* Not promiscuous */, interval_g, @@ -270,13 +252,11 @@ static void *dns_child_loop (void *dummy) memset (&fp, 0, sizeof (fp)); if (pcap_compile (pcap_obj, &fp, "udp port 53", 1, 0) < 0) { - DEBUG ("pcap_compile failed"); ERROR ("dns plugin: pcap_compile failed"); return (NULL); } if (pcap_setfilter (pcap_obj, &fp) < 0) { - DEBUG ("pcap_setfilter failed"); ERROR ("dns plugin: pcap_setfilter failed"); return (NULL); } @@ -341,12 +321,12 @@ static void submit_counter (const char *type, const char *type_instance, vl.values = values; vl.values_len = 1; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "dns"); - strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "dns", sizeof (vl.plugin)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - plugin_dispatch_values (type, &vl); + plugin_dispatch_values (&vl); } /* void submit_counter */ static void submit_octets (counter_t queries, counter_t responses) @@ -359,11 +339,11 @@ static void submit_octets (counter_t queries, counter_t responses) vl.values = values; vl.values_len = 2; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "dns"); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "dns", sizeof (vl.plugin)); + sstrncpy (vl.type, "dns_octets", sizeof (vl.type)); - plugin_dispatch_values ("dns_octets", &vl); + plugin_dispatch_values (&vl); } /* void submit_counter */ static int dns_read (void) @@ -379,7 +359,9 @@ static int dns_read (void) values[0] = tr_queries; values[1] = tr_responses; pthread_mutex_unlock (&traffic_mutex); - submit_octets (values[0], values[1]); + + if ((values[0] != 0) || (values[1] != 0)) + submit_octets (values[0], values[1]); pthread_mutex_lock (&qtype_mutex); for (ptr = qtype_list, len = 0; @@ -431,24 +413,10 @@ static int dns_read (void) return (0); } /* int dns_read */ -#endif -void module_register (modreg_e load) +void module_register (void) { - if (load & MR_DATASETS) - { - plugin_register_data_set (&octets_ds); - plugin_register_data_set (&qtype_ds); - plugin_register_data_set (&opcode_ds); - plugin_register_data_set (&rcode_ds); - } - -#if DNS_HAVE_READ - if (load & MR_READ) - { - plugin_register_config ("dns", dns_config, config_keys, config_keys_num); - plugin_register_init ("dns", dns_init); - plugin_register_read ("dns", dns_read); - } -#endif + plugin_register_config ("dns", dns_config, config_keys, config_keys_num); + plugin_register_init ("dns", dns_init); + plugin_register_read ("dns", dns_read); } /* void module_register */