X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=c315eab960578f75df75476465726b387e9adf47;hb=589c5f25f9cb723575fa16dd22e73dc9e7af0cfd;hp=2cbd0c37dd321e1b133ddfbfc8e38bb502bb31b8;hpb=12c1e32ec71ffd5d90af5df4b430fba04d91aed5;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index 2cbd0c37..364b9587 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,9 +17,12 @@
  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  * Authors:
- *   Florian octo Forster <octo at verplant.org>
+ *   Florian octo Forster <octo at collectd.org>
+ *   Mirko Buffoni <briareos at eswat.org>
  **/
 
+#define _BSD_SOURCE
+
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
@@ -26,9 +30,13 @@
 
 #include "utils_dns.h"
 #include <pthread.h>
-#include <pcap.h>
 #include <poll.h>
 
+#include <pcap.h>
+#if HAVE_PCAP_BPF_H
+# include <pcap-bpf.h>
+#endif
+
 /*
  * Private data types
  */
@@ -47,9 +55,10 @@ 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;
@@ -156,6 +165,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);
@@ -169,13 +185,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
 	{
@@ -195,7 +222,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 (__attribute__((unused)) void *dummy)
 {
 	pcap_t *pcap_obj;
 	char    pcap_error[PCAP_ERRBUF_SIZE];
@@ -211,8 +238,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,
@@ -229,13 +256,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);
 	}
@@ -300,12 +325,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)
@@ -318,11 +343,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)