X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=d82cbd86cc19809f7ff4180868534911a9049dc7;hb=bc7992ed0693313a2b1fe282a5bf23f1cc9f8e42;hp=d4e56dac059ca6ede79ecfbcea0148fea6a2aa5c;hpb=4566cb8eac15eb7d438087583c3048ccf00c3c6b;p=collectd.git diff --git a/src/dns.c b/src/dns.c index d4e56dac..d82cbd86 100644 --- a/src/dns.c +++ b/src/dns.c @@ -23,22 +23,15 @@ #include "common.h" #include "plugin.h" #include "configfile.h" -#include "utils_debug.h" -#include "utils_dns.h" -#if HAVE_LIBPCAP && HAVE_LIBPTHREAD -# 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; @@ -46,43 +39,10 @@ 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", @@ -107,24 +67,22 @@ 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; - DBG ("counter_list_search (list = %p, key = %u)", + DEBUG ("counter_list_search (list = %p, key = %u)", (void *) *list, key); for (entry = *list; entry != NULL; entry = entry->next) if (entry->key == key) break; - DBG ("return (%p)", (void *) entry); + DEBUG ("return (%p)", (void *) entry); return (entry); } @@ -133,7 +91,7 @@ static counter_list_t *counter_list_create (counter_list_t **list, { counter_list_t *entry; - DBG ("counter_list_create (list = %p, key = %u, value = %u)", + DEBUG ("counter_list_create (list = %p, key = %u, value = %u)", (void *) *list, key, value); entry = (counter_list_t *) malloc (sizeof (counter_list_t)); @@ -159,7 +117,7 @@ static counter_list_t *counter_list_create (counter_list_t **list, last->next = entry; } - DBG ("return (%p)", (void *) entry); + DEBUG ("return (%p)", (void *) entry); return (entry); } @@ -168,7 +126,7 @@ static void counter_list_add (counter_list_t **list, { counter_list_t *entry; - DBG ("counter_list_add (list = %p, key = %u, increment = %u)", + DEBUG ("counter_list_add (list = %p, key = %u, increment = %u)", (void *) *list, key, increment); entry = counter_list_search (list, key); @@ -181,7 +139,7 @@ static void counter_list_add (counter_list_t **list, { counter_list_create (list, key, increment); } - DBG ("return ()"); + DEBUG ("return ()"); } static int dns_config (const char *key, const char *value) @@ -253,15 +211,15 @@ static void *dns_child_loop (void *dummy) } /* Passing `pcap_device == NULL' is okay and the same as passign "any" */ - DBG ("Creating PCAP object.."); + DEBUG ("Creating PCAP object.."); pcap_obj = pcap_open_live (pcap_device, PCAP_SNAPLEN, 0 /* Not promiscuous */, - atoi (COLLECTD_STEP), + interval_g, pcap_error); if (pcap_obj == NULL) { - syslog (LOG_ERR, "dns plugin: Opening interface `%s' " + ERROR ("dns plugin: Opening interface `%s' " "failed: %s", (pcap_device != NULL) ? pcap_device : "any", pcap_error); @@ -271,18 +229,16 @@ static void *dns_child_loop (void *dummy) memset (&fp, 0, sizeof (fp)); if (pcap_compile (pcap_obj, &fp, "udp port 53", 1, 0) < 0) { - DBG ("pcap_compile failed"); - syslog (LOG_ERR, "dns plugin: pcap_compile failed"); + ERROR ("dns plugin: pcap_compile failed"); return (NULL); } if (pcap_setfilter (pcap_obj, &fp) < 0) { - DBG ("pcap_setfilter failed"); - syslog (LOG_ERR, "dns plugin: pcap_setfilter failed"); + ERROR ("dns plugin: pcap_setfilter failed"); return (NULL); } - DBG ("PCAP object created."); + DEBUG ("PCAP object created."); dnstop_set_pcap_obj (pcap_obj); dnstop_set_callback (dns_child_callback); @@ -292,10 +248,10 @@ static void *dns_child_loop (void *dummy) handle_pcap /* callback */, NULL /* Whatever this means.. */); if (status < 0) - syslog (LOG_ERR, "dns plugin: Listener thread is exiting " + ERROR ("dns plugin: Listener thread is exiting " "abnormally: %s", pcap_geterr (pcap_obj)); - DBG ("child is exiting"); + DEBUG ("child is exiting"); pcap_close (pcap_obj); listen_thread_init = 0; @@ -321,8 +277,9 @@ static int dns_init (void) (void *) 0); if (status != 0) { - syslog (LOG_ERR, "dns plugin: pthread_create failed: %s", - strerror (status)); + char errbuf[1024]; + ERROR ("dns plugin: pthread_create failed: %s", + sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -341,12 +298,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); - 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 +316,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); - 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 +336,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; @@ -393,7 +352,7 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DBG ("qtype = %u; counter = %u;", keys[i], values[i]); + DEBUG ("qtype = %u; counter = %u;", keys[i], values[i]); submit_counter ("dns_qtype", qtype_str (keys[i]), values[i]); } @@ -409,7 +368,7 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DBG ("opcode = %u; counter = %u;", keys[i], values[i]); + DEBUG ("opcode = %u; counter = %u;", keys[i], values[i]); submit_counter ("dns_opcode", opcode_str (keys[i]), values[i]); } @@ -425,24 +384,16 @@ static int dns_read (void) for (i = 0; i < len; i++) { - DBG ("rcode = %u; counter = %u;", keys[i], values[i]); + DEBUG ("rcode = %u; counter = %u;", keys[i], values[i]); submit_counter ("dns_rcode", rcode_str (keys[i]), values[i]); } return (0); } /* int dns_read */ -#endif void module_register (void) { - 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 plugin_register_config ("dns", dns_config, config_keys, config_keys_num); plugin_register_init ("dns", dns_init); plugin_register_read ("dns", dns_read); -#endif } /* void module_register */