X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=e9996b996d74409b3a4fbd0a61635dd4ce63b8ca;hb=e686e07b9c1ffcb3a9be3483a39b069ac5795867;hp=c9beb166e8f0a6f09c076cd554d244ad031808d6;hpb=06adec208286b5a136ffa5c5f3832c35e9f62844;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index c9beb166..e9996b99 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -24,20 +24,14 @@
 #include "plugin.h"
 #include "configfile.h"
 
-#if HAVE_LIBPCAP && HAVE_LIBPTHREAD
-# include "utils_dns.h"
-# include <pthread.h>
-# include <pcap.h>
-# include <poll.h>
-# define DNS_HAVE_READ 1
-#else
-# define DNS_HAVE_READ 0
-#endif
+#include "utils_dns.h"
+#include <pthread.h>
+#include <pcap.h>
+#include <poll.h>
 
 /*
  * Private data types
  */
-#if DNS_HAVE_READ
 struct counter_list_s
 {
 	unsigned int key;
@@ -45,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",
@@ -106,12 +67,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;
@@ -270,13 +229,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);
 	}
@@ -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;
@@ -431,24 +390,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 */