X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdns.c;h=6e63fe4474f030a1ad65fb17360c5135e7adb308;hb=3e375cba6873e0e5d47de4b16058cbd5ceb96184;hp=3de7c34a89de73986e3b4d2fd36550a102e3da1e;hpb=03aa21f08fede809f37a7443d3124fb9314f4dc8;p=collectd.git

diff --git a/src/dns.c b/src/dns.c
index 3de7c34a..6e63fe44 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,6 +18,7 @@
  *
  * Authors:
  *   Florian octo Forster <octo at verplant.org>
+ *   Mirko Buffoni <briareos at eswat.org>
  **/
 
 #define _BSD_SOURCE
@@ -49,9 +51,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;
@@ -77,14 +80,10 @@ static counter_list_t *counter_list_search (counter_list_t **list, unsigned int
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_search (list = %p, key = %u)",
-			(void *) *list, key);
-
 	for (entry = *list; entry != NULL; entry = entry->next)
 		if (entry->key == key)
 			break;
 
-	DEBUG ("return (%p)", (void *) entry);
 	return (entry);
 }
 
@@ -93,9 +92,6 @@ static counter_list_t *counter_list_create (counter_list_t **list,
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_create (list = %p, key = %u, value = %u)",
-			(void *) *list, key, value);
-
 	entry = (counter_list_t *) malloc (sizeof (counter_list_t));
 	if (entry == NULL)
 		return (NULL);
@@ -119,7 +115,6 @@ static counter_list_t *counter_list_create (counter_list_t **list,
 		last->next = entry;
 	}
 
-	DEBUG ("return (%p)", (void *) entry);
 	return (entry);
 }
 
@@ -128,9 +123,6 @@ static void counter_list_add (counter_list_t **list,
 {
 	counter_list_t *entry;
 
-	DEBUG ("counter_list_add (list = %p, key = %u, increment = %u)",
-			(void *) *list, key, increment);
-
 	entry = counter_list_search (list, key);
 
 	if (entry != NULL)
@@ -141,7 +133,6 @@ static void counter_list_add (counter_list_t **list,
 	{
 		counter_list_create (list, key, increment);
 	}
-	DEBUG ("return ()");
 }
 
 static int dns_config (const char *key, const char *value)
@@ -158,6 +149,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);
@@ -171,13 +169,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
 	{
@@ -240,7 +249,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy)
 		return (NULL);
 	}
 
-	DEBUG ("PCAP object created.");
+	DEBUG ("dns plugin: PCAP object created.");
 
 	dnstop_set_pcap_obj (pcap_obj);
 	dnstop_set_callback (dns_child_callback);
@@ -253,7 +262,7 @@ static void *dns_child_loop (void __attribute__((unused)) *dummy)
 		ERROR ("dns plugin: Listener thread is exiting "
 				"abnormally: %s", pcap_geterr (pcap_obj));
 
-	DEBUG ("child is exiting");
+	DEBUG ("dns plugin: Child is exiting.");
 
 	pcap_close (pcap_obj);
 	listen_thread_init = 0;
@@ -354,7 +363,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("qtype = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: qtype = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_qtype", qtype_str (keys[i]), values[i]);
 	}
 
@@ -370,7 +379,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("opcode = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: opcode = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_opcode", opcode_str (keys[i]), values[i]);
 	}
 
@@ -386,7 +395,7 @@ static int dns_read (void)
 
 	for (i = 0; i < len; i++)
 	{
-		DEBUG ("rcode = %u; counter = %u;", keys[i], values[i]);
+		DEBUG ("dns plugin: rcode = %u; counter = %u;", keys[i], values[i]);
 		submit_counter ("dns_rcode", rcode_str (keys[i]), values[i]);
 	}