X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=473003a74af301355c9947353344a59c564c6042;hb=05b7b7e327b01a33da39f5550694294fd0d29849;hp=332ef0ea2c25a2305e1d08255e2cdf57e33f3232;hpb=6360474f4aa35dd1a587b6148ff88a23e6155132;p=collectd.git diff --git a/src/dns.c b/src/dns.c index 332ef0ea..473003a7 100644 --- a/src/dns.c +++ b/src/dns.c @@ -23,7 +23,6 @@ #include "common.h" #include "plugin.h" #include "configfile.h" -#include "utils_debug.h" #if HAVE_LIBPCAP && HAVE_LIBPTHREAD # include "utils_dns.h" @@ -117,14 +116,14 @@ static counter_list_t *counter_list_search (counter_list_t **list, unsigned int { 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 +132,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 +158,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 +167,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 +180,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 +252,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 +270,18 @@ 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"); + DEBUG ("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"); + DEBUG ("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 +291,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 +320,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); } @@ -342,7 +342,7 @@ 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.host, hostname_g); strcpy (vl.plugin, "dns"); strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); @@ -360,7 +360,7 @@ 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.host, hostname_g); strcpy (vl.plugin, "dns"); plugin_dispatch_values ("dns_octets", &vl); @@ -393,7 +393,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 +409,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,7 +425,7 @@ 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]); }